diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:28:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:28:10 -0400 |
commit | 4c5811bf463b0ef82fabbd1708f8bb2d753aeb18 (patch) | |
tree | ff37d31217c3804ca05de21a55a9b5ca1ca818b2 /drivers/ata | |
parent | f74b9444192c60603020c61d7915b72893137edc (diff) | |
parent | 9f15444fefdb33509132ff5c9be60cb315c44cb2 (diff) |
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
tty: serial: altera_jtaguart: Add device tree support
tty: serial: altera_uart: Add devicetree support
dt: eliminate of_platform_driver shim code
dt: Eliminate of_platform_{,un}register_driver
dt/serial: Eliminate users of of_platform_{,un}register_driver
dt/usb: Eliminate users of of_platform_{,un}register_driver
dt/video: Eliminate users of of_platform_{,un}register_driver
dt/net: Eliminate users of of_platform_{,un}register_driver
dt/sound: Eliminate users of of_platform_{,un}register_driver
dt/spi: Eliminate users of of_platform_{,un}register_driver
dt: uartlite: merge platform and of_platform driver bindings
dt: xilinx_hwicap: merge platform and of_platform driver bindings
ipmi: convert OF driver to platform driver
leds/leds-gpio: merge platform_driver with of_platform_driver
dt/sparc: Eliminate users of of_platform_{,un}register_driver
dt/powerpc: Eliminate users of of_platform_{,un}register_driver
dt/powerpc: move of_bus_type infrastructure to ibmebus
drivercore/dt: add a match table pointer to struct device
dt: Typo fix.
altera_ps2: Add devicetree support
...
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_mpc52xx.c | 8 | ||||
-rw-r--r-- | drivers/ata/pata_of_platform.c | 9 | ||||
-rw-r--r-- | drivers/ata/sata_dwc_460ex.c | 9 | ||||
-rw-r--r-- | drivers/ata/sata_fsl.c | 9 |
4 files changed, 16 insertions, 19 deletions
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index d7d8026cde99..2fcac511d39c 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c | |||
@@ -680,7 +680,7 @@ mpc52xx_ata_remove_one(struct device *dev) | |||
680 | /* ======================================================================== */ | 680 | /* ======================================================================== */ |
681 | 681 | ||
682 | static int __devinit | 682 | static int __devinit |
683 | mpc52xx_ata_probe(struct platform_device *op, const struct of_device_id *match) | 683 | mpc52xx_ata_probe(struct platform_device *op) |
684 | { | 684 | { |
685 | unsigned int ipb_freq; | 685 | unsigned int ipb_freq; |
686 | struct resource res_mem; | 686 | struct resource res_mem; |
@@ -883,7 +883,7 @@ static struct of_device_id mpc52xx_ata_of_match[] = { | |||
883 | }; | 883 | }; |
884 | 884 | ||
885 | 885 | ||
886 | static struct of_platform_driver mpc52xx_ata_of_platform_driver = { | 886 | static struct platform_driver mpc52xx_ata_of_platform_driver = { |
887 | .probe = mpc52xx_ata_probe, | 887 | .probe = mpc52xx_ata_probe, |
888 | .remove = mpc52xx_ata_remove, | 888 | .remove = mpc52xx_ata_remove, |
889 | #ifdef CONFIG_PM | 889 | #ifdef CONFIG_PM |
@@ -906,13 +906,13 @@ static int __init | |||
906 | mpc52xx_ata_init(void) | 906 | mpc52xx_ata_init(void) |
907 | { | 907 | { |
908 | printk(KERN_INFO "ata: MPC52xx IDE/ATA libata driver\n"); | 908 | printk(KERN_INFO "ata: MPC52xx IDE/ATA libata driver\n"); |
909 | return of_register_platform_driver(&mpc52xx_ata_of_platform_driver); | 909 | return platform_driver_register(&mpc52xx_ata_of_platform_driver); |
910 | } | 910 | } |
911 | 911 | ||
912 | static void __exit | 912 | static void __exit |
913 | mpc52xx_ata_exit(void) | 913 | mpc52xx_ata_exit(void) |
914 | { | 914 | { |
915 | of_unregister_platform_driver(&mpc52xx_ata_of_platform_driver); | 915 | platform_driver_unregister(&mpc52xx_ata_of_platform_driver); |
916 | } | 916 | } |
917 | 917 | ||
918 | module_init(mpc52xx_ata_init); | 918 | module_init(mpc52xx_ata_init); |
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c index 480e043ce6b8..f3054009bd25 100644 --- a/drivers/ata/pata_of_platform.c +++ b/drivers/ata/pata_of_platform.c | |||
@@ -14,8 +14,7 @@ | |||
14 | #include <linux/of_platform.h> | 14 | #include <linux/of_platform.h> |
15 | #include <linux/ata_platform.h> | 15 | #include <linux/ata_platform.h> |
16 | 16 | ||
17 | static int __devinit pata_of_platform_probe(struct platform_device *ofdev, | 17 | static int __devinit pata_of_platform_probe(struct platform_device *ofdev) |
18 | const struct of_device_id *match) | ||
19 | { | 18 | { |
20 | int ret; | 19 | int ret; |
21 | struct device_node *dn = ofdev->dev.of_node; | 20 | struct device_node *dn = ofdev->dev.of_node; |
@@ -90,7 +89,7 @@ static struct of_device_id pata_of_platform_match[] = { | |||
90 | }; | 89 | }; |
91 | MODULE_DEVICE_TABLE(of, pata_of_platform_match); | 90 | MODULE_DEVICE_TABLE(of, pata_of_platform_match); |
92 | 91 | ||
93 | static struct of_platform_driver pata_of_platform_driver = { | 92 | static struct platform_driver pata_of_platform_driver = { |
94 | .driver = { | 93 | .driver = { |
95 | .name = "pata_of_platform", | 94 | .name = "pata_of_platform", |
96 | .owner = THIS_MODULE, | 95 | .owner = THIS_MODULE, |
@@ -102,13 +101,13 @@ static struct of_platform_driver pata_of_platform_driver = { | |||
102 | 101 | ||
103 | static int __init pata_of_platform_init(void) | 102 | static int __init pata_of_platform_init(void) |
104 | { | 103 | { |
105 | return of_register_platform_driver(&pata_of_platform_driver); | 104 | return platform_driver_register(&pata_of_platform_driver); |
106 | } | 105 | } |
107 | module_init(pata_of_platform_init); | 106 | module_init(pata_of_platform_init); |
108 | 107 | ||
109 | static void __exit pata_of_platform_exit(void) | 108 | static void __exit pata_of_platform_exit(void) |
110 | { | 109 | { |
111 | of_unregister_platform_driver(&pata_of_platform_driver); | 110 | platform_driver_unregister(&pata_of_platform_driver); |
112 | } | 111 | } |
113 | module_exit(pata_of_platform_exit); | 112 | module_exit(pata_of_platform_exit); |
114 | 113 | ||
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c index 712ab5a4922e..1c4b3aa4c7c4 100644 --- a/drivers/ata/sata_dwc_460ex.c +++ b/drivers/ata/sata_dwc_460ex.c | |||
@@ -1625,8 +1625,7 @@ static const struct ata_port_info sata_dwc_port_info[] = { | |||
1625 | }, | 1625 | }, |
1626 | }; | 1626 | }; |
1627 | 1627 | ||
1628 | static int sata_dwc_probe(struct platform_device *ofdev, | 1628 | static int sata_dwc_probe(struct platform_device *ofdev) |
1629 | const struct of_device_id *match) | ||
1630 | { | 1629 | { |
1631 | struct sata_dwc_device *hsdev; | 1630 | struct sata_dwc_device *hsdev; |
1632 | u32 idr, versionr; | 1631 | u32 idr, versionr; |
@@ -1764,7 +1763,7 @@ static const struct of_device_id sata_dwc_match[] = { | |||
1764 | }; | 1763 | }; |
1765 | MODULE_DEVICE_TABLE(of, sata_dwc_match); | 1764 | MODULE_DEVICE_TABLE(of, sata_dwc_match); |
1766 | 1765 | ||
1767 | static struct of_platform_driver sata_dwc_driver = { | 1766 | static struct platform_driver sata_dwc_driver = { |
1768 | .driver = { | 1767 | .driver = { |
1769 | .name = DRV_NAME, | 1768 | .name = DRV_NAME, |
1770 | .owner = THIS_MODULE, | 1769 | .owner = THIS_MODULE, |
@@ -1776,12 +1775,12 @@ static struct of_platform_driver sata_dwc_driver = { | |||
1776 | 1775 | ||
1777 | static int __init sata_dwc_init(void) | 1776 | static int __init sata_dwc_init(void) |
1778 | { | 1777 | { |
1779 | return of_register_platform_driver(&sata_dwc_driver); | 1778 | return platform_driver_register(&sata_dwc_driver); |
1780 | } | 1779 | } |
1781 | 1780 | ||
1782 | static void __exit sata_dwc_exit(void) | 1781 | static void __exit sata_dwc_exit(void) |
1783 | { | 1782 | { |
1784 | of_unregister_platform_driver(&sata_dwc_driver); | 1783 | platform_driver_unregister(&sata_dwc_driver); |
1785 | } | 1784 | } |
1786 | 1785 | ||
1787 | module_init(sata_dwc_init); | 1786 | module_init(sata_dwc_init); |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 7f9eab34a386..ef3ce26bb1f0 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -1300,8 +1300,7 @@ static const struct ata_port_info sata_fsl_port_info[] = { | |||
1300 | }, | 1300 | }, |
1301 | }; | 1301 | }; |
1302 | 1302 | ||
1303 | static int sata_fsl_probe(struct platform_device *ofdev, | 1303 | static int sata_fsl_probe(struct platform_device *ofdev) |
1304 | const struct of_device_id *match) | ||
1305 | { | 1304 | { |
1306 | int retval = -ENXIO; | 1305 | int retval = -ENXIO; |
1307 | void __iomem *hcr_base = NULL; | 1306 | void __iomem *hcr_base = NULL; |
@@ -1437,7 +1436,7 @@ static struct of_device_id fsl_sata_match[] = { | |||
1437 | 1436 | ||
1438 | MODULE_DEVICE_TABLE(of, fsl_sata_match); | 1437 | MODULE_DEVICE_TABLE(of, fsl_sata_match); |
1439 | 1438 | ||
1440 | static struct of_platform_driver fsl_sata_driver = { | 1439 | static struct platform_driver fsl_sata_driver = { |
1441 | .driver = { | 1440 | .driver = { |
1442 | .name = "fsl-sata", | 1441 | .name = "fsl-sata", |
1443 | .owner = THIS_MODULE, | 1442 | .owner = THIS_MODULE, |
@@ -1453,13 +1452,13 @@ static struct of_platform_driver fsl_sata_driver = { | |||
1453 | 1452 | ||
1454 | static int __init sata_fsl_init(void) | 1453 | static int __init sata_fsl_init(void) |
1455 | { | 1454 | { |
1456 | of_register_platform_driver(&fsl_sata_driver); | 1455 | platform_driver_register(&fsl_sata_driver); |
1457 | return 0; | 1456 | return 0; |
1458 | } | 1457 | } |
1459 | 1458 | ||
1460 | static void __exit sata_fsl_exit(void) | 1459 | static void __exit sata_fsl_exit(void) |
1461 | { | 1460 | { |
1462 | of_unregister_platform_driver(&fsl_sata_driver); | 1461 | platform_driver_unregister(&fsl_sata_driver); |
1463 | } | 1462 | } |
1464 | 1463 | ||
1465 | MODULE_LICENSE("GPL"); | 1464 | MODULE_LICENSE("GPL"); |