diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:37 +0100 |
| commit | 13408877f4c0d4b2784d3388dd4481369205e46a (patch) | |
| tree | 81bd24a8bac468785989c5b8b82a489befcddc5a /drivers/ata | |
| parent | 908bc8ce45f428658dab5826eb6fa2e5d9151aa1 (diff) | |
| parent | 14743045fb31bd1d2d4b7eb2ccd2e956b44b01bd (diff) | |
| download | barebox-13408877f4c0d4b2784d3388dd4481369205e46a.tar.gz barebox-13408877f4c0d4b2784d3388dd4481369205e46a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ata/ahci.c | 8 | ||||
| -rw-r--r-- | drivers/ata/intf_platform_ide.c | 8 | ||||
| -rw-r--r-- | drivers/ata/pata-imx.c | 8 | ||||
| -rw-r--r-- | drivers/ata/sata-imx.c | 8 |
5 files changed, 5 insertions, 28 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index ff6528acf4..42f2065a61 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -38,6 +38,7 @@ config DISK_AHCI select DISK_DRIVE config DISK_AHCI_IMX + depends on ARCH_IMX depends on DISK_AHCI bool "i.MX AHCI support" diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 2d6e42232f..4d5b52afe5 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -685,10 +685,4 @@ static struct driver_d ahci_driver = { .info = ahci_info, .of_compatible = DRV_OF_COMPAT(ahci_dt_ids), }; - -static int ahci_init(void) -{ - return platform_driver_register(&ahci_driver); -} - -device_initcall(ahci_init); +device_platform_driver(ahci_driver); diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c index 6473b38ba3..0b56eb4aa8 100644 --- a/drivers/ata/intf_platform_ide.c +++ b/drivers/ata/intf_platform_ide.c @@ -108,13 +108,7 @@ static struct driver_d platform_ide_driver = { .name = "ide_intf", .probe = platform_ide_probe, }; - -static int platform_ide_init(void) -{ - return platform_driver_register(&platform_ide_driver); -} - -device_initcall(platform_ide_init); +device_platform_driver(platform_ide_driver); /** * @file diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c index 202f537569..5d44883453 100644 --- a/drivers/ata/pata-imx.c +++ b/drivers/ata/pata-imx.c @@ -194,10 +194,4 @@ static struct driver_d imx_pata_driver = { .name = "imx-pata", .probe = imx_pata_probe, }; - -static int imx_pata_init(void) -{ - return platform_driver_register(&imx_pata_driver); -} - -device_initcall(imx_pata_init); +device_platform_driver(imx_pata_driver); diff --git a/drivers/ata/sata-imx.c b/drivers/ata/sata-imx.c index fc57f5f104..bd48fae1f4 100644 --- a/drivers/ata/sata-imx.c +++ b/drivers/ata/sata-imx.c @@ -146,10 +146,4 @@ static struct driver_d imx_sata_driver = { .info = ahci_info, .id_table = imx_sata_ids, }; - -static int ahci_init(void) -{ - return platform_driver_register(&imx_sata_driver); -} - -device_initcall(ahci_init); +device_platform_driver(imx_sata_driver); |