Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0a86e1c857134efe2cdb31d74bc7ea21721db494

Authored by Jingoo Han
Committed by Tejun Heo
1 parent f6e984e636
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ata: use pci_get_drvdata() 

Use the wrapper function for getting the driver data using pci_dev
instead of using dev_get_drvdata() with &pdev->dev, so we can directly
pass a struct pci_dev.  This is a purely cosmetic change.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

Showing 30 changed files with 37 additions and 37 deletions Side-by-side Diff

drivers/ata/acard-ahci.c
Diff comments   View file @ 0a86e1c
... ... @@ -128,7 +128,7 @@
128 128 #ifdef CONFIG_PM
129 129 static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
130 130 {
131   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  131 + struct ata_host *host = pci_get_drvdata(pdev);
132 132 struct ahci_host_priv *hpriv = host->private_data;
133 133 void __iomem *mmio = hpriv->mmio;
134 134 u32 ctl;
... ... @@ -156,7 +156,7 @@
156 156  
157 157 static int acard_ahci_pci_device_resume(struct pci_dev *pdev)
158 158 {
159   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  159 + struct ata_host *host = pci_get_drvdata(pdev);
160 160 int rc;
161 161  
162 162 rc = ata_pci_device_do_resume(pdev);
... ... @@ -616,7 +616,7 @@
616 616 #ifdef CONFIG_PM
617 617 static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
618 618 {
619   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  619 + struct ata_host *host = pci_get_drvdata(pdev);
620 620 struct ahci_host_priv *hpriv = host->private_data;
621 621 void __iomem *mmio = hpriv->mmio;
622 622 u32 ctl;
... ... @@ -644,7 +644,7 @@
644 644  
645 645 static int ahci_pci_device_resume(struct pci_dev *pdev)
646 646 {
647   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  647 + struct ata_host *host = pci_get_drvdata(pdev);
648 648 int rc;
649 649  
650 650 rc = ata_pci_device_do_resume(pdev);
drivers/ata/ata_piix.c
Diff comments   View file @ 0a86e1c
... ... @@ -988,7 +988,7 @@
988 988  
989 989 static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
990 990 {
991   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  991 + struct ata_host *host = pci_get_drvdata(pdev);
992 992 unsigned long flags;
993 993 int rc = 0;
994 994  
... ... @@ -1023,7 +1023,7 @@
1023 1023  
1024 1024 static int piix_pci_device_resume(struct pci_dev *pdev)
1025 1025 {
1026   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  1026 + struct ata_host *host = pci_get_drvdata(pdev);
1027 1027 unsigned long flags;
1028 1028 int rc;
1029 1029  
... ... @@ -1736,7 +1736,7 @@
1736 1736  
1737 1737 static void piix_remove_one(struct pci_dev *pdev)
1738 1738 {
1739   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  1739 + struct ata_host *host = pci_get_drvdata(pdev);
1740 1740 struct piix_host_priv *hpriv = host->private_data;
1741 1741  
1742 1742 pci_write_config_dword(pdev, PIIX_IOCFG, hpriv->saved_iocfg);
drivers/ata/pata_ali.c
Diff comments   View file @ 0a86e1c
... ... @@ -592,7 +592,7 @@
592 592 #ifdef CONFIG_PM
593 593 static int ali_reinit_one(struct pci_dev *pdev)
594 594 {
595   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  595 + struct ata_host *host = pci_get_drvdata(pdev);
596 596 int rc;
597 597  
598 598 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_amd.c
Diff comments   View file @ 0a86e1c
... ... @@ -578,7 +578,7 @@
578 578 #ifdef CONFIG_PM
579 579 static int amd_reinit_one(struct pci_dev *pdev)
580 580 {
581   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  581 + struct ata_host *host = pci_get_drvdata(pdev);
582 582 int rc;
583 583  
584 584 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_artop.c
Diff comments   View file @ 0a86e1c
... ... @@ -426,7 +426,7 @@
426 426 #ifdef CONFIG_PM
427 427 static int atp8xx_reinit_one(struct pci_dev *pdev)
428 428 {
429   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  429 + struct ata_host *host = pci_get_drvdata(pdev);
430 430 int rc;
431 431  
432 432 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_atp867x.c
Diff comments   View file @ 0a86e1c
... ... @@ -534,7 +534,7 @@
534 534 #ifdef CONFIG_PM
535 535 static int atp867x_reinit_one(struct pci_dev *pdev)
536 536 {
537   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  537 + struct ata_host *host = pci_get_drvdata(pdev);
538 538 int rc;
539 539  
540 540 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_cmd640.c
Diff comments   View file @ 0a86e1c
... ... @@ -235,7 +235,7 @@
235 235 #ifdef CONFIG_PM
236 236 static int cmd640_reinit_one(struct pci_dev *pdev)
237 237 {
238   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  238 + struct ata_host *host = pci_get_drvdata(pdev);
239 239 int rc;
240 240  
241 241 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_cmd64x.c
Diff comments   View file @ 0a86e1c
... ... @@ -491,7 +491,7 @@
491 491 #ifdef CONFIG_PM
492 492 static int cmd64x_reinit_one(struct pci_dev *pdev)
493 493 {
494   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  494 + struct ata_host *host = pci_get_drvdata(pdev);
495 495 int rc;
496 496  
497 497 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_cs5520.c
Diff comments   View file @ 0a86e1c
... ... @@ -241,7 +241,7 @@
241 241  
242 242 static int cs5520_reinit_one(struct pci_dev *pdev)
243 243 {
244   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  244 + struct ata_host *host = pci_get_drvdata(pdev);
245 245 u8 pcicfg;
246 246 int rc;
247 247  
... ... @@ -269,7 +269,7 @@
269 269  
270 270 static int cs5520_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
271 271 {
272   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  272 + struct ata_host *host = pci_get_drvdata(pdev);
273 273 int rc = 0;
274 274  
275 275 rc = ata_host_suspend(host, mesg);
drivers/ata/pata_cs5530.c
Diff comments   View file @ 0a86e1c
... ... @@ -330,7 +330,7 @@
330 330 #ifdef CONFIG_PM
331 331 static int cs5530_reinit_one(struct pci_dev *pdev)
332 332 {
333   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  333 + struct ata_host *host = pci_get_drvdata(pdev);
334 334 int rc;
335 335  
336 336 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_hpt366.c
Diff comments   View file @ 0a86e1c
... ... @@ -390,7 +390,7 @@
390 390 #ifdef CONFIG_PM
391 391 static int hpt36x_reinit_one(struct pci_dev *dev)
392 392 {
393   - struct ata_host *host = dev_get_drvdata(&dev->dev);
  393 + struct ata_host *host = pci_get_drvdata(dev);
394 394 int rc;
395 395  
396 396 rc = ata_pci_device_do_resume(dev);
drivers/ata/pata_hpt3x3.c
Diff comments   View file @ 0a86e1c
... ... @@ -253,7 +253,7 @@
253 253 #ifdef CONFIG_PM
254 254 static int hpt3x3_reinit_one(struct pci_dev *dev)
255 255 {
256   - struct ata_host *host = dev_get_drvdata(&dev->dev);
  256 + struct ata_host *host = pci_get_drvdata(dev);
257 257 int rc;
258 258  
259 259 rc = ata_pci_device_do_resume(dev);
drivers/ata/pata_it821x.c
Diff comments   View file @ 0a86e1c
... ... @@ -939,7 +939,7 @@
939 939 #ifdef CONFIG_PM
940 940 static int it821x_reinit_one(struct pci_dev *pdev)
941 941 {
942   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  942 + struct ata_host *host = pci_get_drvdata(pdev);
943 943 int rc;
944 944  
945 945 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_macio.c
Diff comments   View file @ 0a86e1c
... ... @@ -1311,7 +1311,7 @@
1311 1311  
1312 1312 static void pata_macio_pci_detach(struct pci_dev *pdev)
1313 1313 {
1314   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  1314 + struct ata_host *host = pci_get_drvdata(pdev);
1315 1315  
1316 1316 ata_host_detach(host);
1317 1317 }
1318 1318  
... ... @@ -1320,14 +1320,14 @@
1320 1320  
1321 1321 static int pata_macio_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
1322 1322 {
1323   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  1323 + struct ata_host *host = pci_get_drvdata(pdev);
1324 1324  
1325 1325 return pata_macio_do_suspend(host->private_data, mesg);
1326 1326 }
1327 1327  
1328 1328 static int pata_macio_pci_resume(struct pci_dev *pdev)
1329 1329 {
1330   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  1330 + struct ata_host *host = pci_get_drvdata(pdev);
1331 1331  
1332 1332 return pata_macio_do_resume(host->private_data);
1333 1333 }
drivers/ata/pata_ninja32.c
Diff comments   View file @ 0a86e1c
... ... @@ -157,7 +157,7 @@
157 157  
158 158 static int ninja32_reinit_one(struct pci_dev *pdev)
159 159 {
160   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  160 + struct ata_host *host = pci_get_drvdata(pdev);
161 161 int rc;
162 162  
163 163 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_ns87415.c
Diff comments   View file @ 0a86e1c
... ... @@ -389,7 +389,7 @@
389 389 #ifdef CONFIG_PM
390 390 static int ns87415_reinit_one(struct pci_dev *pdev)
391 391 {
392   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  392 + struct ata_host *host = pci_get_drvdata(pdev);
393 393 int rc;
394 394  
395 395 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_pdc2027x.c
Diff comments   View file @ 0a86e1c
... ... @@ -765,7 +765,7 @@
765 765 #ifdef CONFIG_PM
766 766 static int pdc2027x_reinit_one(struct pci_dev *pdev)
767 767 {
768   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  768 + struct ata_host *host = pci_get_drvdata(pdev);
769 769 unsigned int board_idx;
770 770 int rc;
771 771  
drivers/ata/pata_rdc.c
Diff comments   View file @ 0a86e1c
... ... @@ -364,7 +364,7 @@
364 364  
365 365 static void rdc_remove_one(struct pci_dev *pdev)
366 366 {
367   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  367 + struct ata_host *host = pci_get_drvdata(pdev);
368 368 struct rdc_host_priv *hpriv = host->private_data;
369 369  
370 370 pci_write_config_dword(pdev, 0x54, hpriv->saved_iocfg);
drivers/ata/pata_rz1000.c
Diff comments   View file @ 0a86e1c
... ... @@ -105,7 +105,7 @@
105 105 #ifdef CONFIG_PM
106 106 static int rz1000_reinit_one(struct pci_dev *pdev)
107 107 {
108   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  108 + struct ata_host *host = pci_get_drvdata(pdev);
109 109 int rc;
110 110  
111 111 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_serverworks.c
Diff comments   View file @ 0a86e1c
... ... @@ -440,7 +440,7 @@
440 440 #ifdef CONFIG_PM
441 441 static int serverworks_reinit_one(struct pci_dev *pdev)
442 442 {
443   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  443 + struct ata_host *host = pci_get_drvdata(pdev);
444 444 int rc;
445 445  
446 446 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_sil680.c
Diff comments   View file @ 0a86e1c
... ... @@ -407,7 +407,7 @@
407 407 #ifdef CONFIG_PM
408 408 static int sil680_reinit_one(struct pci_dev *pdev)
409 409 {
410   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  410 + struct ata_host *host = pci_get_drvdata(pdev);
411 411 int try_mmio, rc;
412 412  
413 413 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_sis.c
Diff comments   View file @ 0a86e1c
... ... @@ -873,7 +873,7 @@
873 873 #ifdef CONFIG_PM
874 874 static int sis_reinit_one(struct pci_dev *pdev)
875 875 {
876   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  876 + struct ata_host *host = pci_get_drvdata(pdev);
877 877 int rc;
878 878  
879 879 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_sl82c105.c
Diff comments   View file @ 0a86e1c
... ... @@ -341,7 +341,7 @@
341 341 #ifdef CONFIG_PM
342 342 static int sl82c105_reinit_one(struct pci_dev *pdev)
343 343 {
344   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  344 + struct ata_host *host = pci_get_drvdata(pdev);
345 345 int rc;
346 346  
347 347 rc = ata_pci_device_do_resume(pdev);
drivers/ata/pata_triflex.c
Diff comments   View file @ 0a86e1c
... ... @@ -211,7 +211,7 @@
211 211 #ifdef CONFIG_PM
212 212 static int triflex_ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
213 213 {
214   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  214 + struct ata_host *host = pci_get_drvdata(pdev);
215 215 int rc = 0;
216 216  
217 217 rc = ata_host_suspend(host, mesg);
drivers/ata/pata_via.c
Diff comments   View file @ 0a86e1c
... ... @@ -673,7 +673,7 @@
673 673  
674 674 static int via_reinit_one(struct pci_dev *pdev)
675 675 {
676   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  676 + struct ata_host *host = pci_get_drvdata(pdev);
677 677 int rc;
678 678  
679 679 rc = ata_pci_device_do_resume(pdev);
drivers/ata/sata_inic162x.c
Diff comments   View file @ 0a86e1c
... ... @@ -776,7 +776,7 @@
776 776 #ifdef CONFIG_PM
777 777 static int inic_pci_device_resume(struct pci_dev *pdev)
778 778 {
779   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  779 + struct ata_host *host = pci_get_drvdata(pdev);
780 780 struct inic_host_priv *hpriv = host->private_data;
781 781 int rc;
782 782  
drivers/ata/sata_nv.c
Diff comments   View file @ 0a86e1c
... ... @@ -2435,7 +2435,7 @@
2435 2435 #ifdef CONFIG_PM
2436 2436 static int nv_pci_device_resume(struct pci_dev *pdev)
2437 2437 {
2438   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  2438 + struct ata_host *host = pci_get_drvdata(pdev);
2439 2439 struct nv_host_priv *hpriv = host->private_data;
2440 2440 int rc;
2441 2441  
drivers/ata/sata_sil.c
Diff comments   View file @ 0a86e1c
... ... @@ -805,7 +805,7 @@
805 805 #ifdef CONFIG_PM
806 806 static int sil_pci_device_resume(struct pci_dev *pdev)
807 807 {
808   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  808 + struct ata_host *host = pci_get_drvdata(pdev);
809 809 int rc;
810 810  
811 811 rc = ata_pci_device_do_resume(pdev);
drivers/ata/sata_sil24.c
Diff comments   View file @ 0a86e1c
... ... @@ -1353,7 +1353,7 @@
1353 1353 #ifdef CONFIG_PM
1354 1354 static int sil24_pci_device_resume(struct pci_dev *pdev)
1355 1355 {
1356   - struct ata_host *host = dev_get_drvdata(&pdev->dev);
  1356 + struct ata_host *host = pci_get_drvdata(pdev);
1357 1357 void __iomem *host_base = host->iomap[SIL24_HOST_BAR];
1358 1358 int rc;
1359 1359