evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ahci_platform: Drop support for imx53-ahci platform device type

Browse source 
Since the 3.13 release the ahci_imx driver has proper devicetree enabled
support for ahci on imx53 and that is used instead of the old board file
created imx53-ahci platform device.

Note this patch also complete drops the id-table, an id-table is not needed
for a single id platform driver, the name field in the driver struct suffices.

And the code already has an explicit "MODULE_ALIAS("platform:ahci");" so the
id-table is not needed for that either.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Hans de Goede 2014-02-22 17:22:54 +01:00 • committed by Tejun Heo
parent f1df8641e2
commit c093e1d36e
1 changed files with 6 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/ata/ahci_platform.c
View file

@ -28,49 +28,17 @@
static void ahci_host_stop(struct ata_host *host); static void ahci_host_stop(struct ata_host *host);
enum ahci_type {
AHCI, /* standard platform ahci */
IMX53_AHCI, /* ahci on i.mx53 */
};
static struct platform_device_id ahci_devtype[] = {
{
.name = "ahci",
.driver_data = AHCI,
}, {
.name = "imx53-ahci",
.driver_data = IMX53_AHCI,
}, {
/* sentinel */
}
};
MODULE_DEVICE_TABLE(platform, ahci_devtype);
struct ata_port_operations ahci_platform_ops = { struct ata_port_operations ahci_platform_ops = {
.inherits = &ahci_ops, .inherits = &ahci_ops,
.host_stop = ahci_host_stop, .host_stop = ahci_host_stop,
}; };
EXPORT_SYMBOL_GPL(ahci_platform_ops); EXPORT_SYMBOL_GPL(ahci_platform_ops);
static struct ata_port_operations ahci_platform_retry_srst_ops = { static const struct ata_port_info ahci_port_info = {
.inherits = &ahci_pmp_retry_srst_ops, .flags = AHCI_FLAG_COMMON,
.host_stop = ahci_host_stop, .pio_mask = ATA_PIO4,
}; .udma_mask = ATA_UDMA6,
.port_ops = &ahci_platform_ops,
static const struct ata_port_info ahci_port_info[] = {
/* by features */
[AHCI] = {
.flags = AHCI_FLAG_COMMON,
.pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6,
.port_ops = &ahci_platform_ops,
},
[IMX53_AHCI] = {
.flags = AHCI_FLAG_COMMON,
.pio_mask = ATA_PIO4,
.udma_mask = ATA_UDMA6,
.port_ops = &ahci_platform_retry_srst_ops,
},
}; };
static struct scsi_host_template ahci_platform_sht = { static struct scsi_host_template ahci_platform_sht = {
@ -416,7 +384,6 @@ static int ahci_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ahci_platform_data *pdata = dev_get_platdata(dev); struct ahci_platform_data *pdata = dev_get_platdata(dev);
const struct platform_device_id *id = platform_get_device_id(pdev);
const struct ata_port_info *pi_template; const struct ata_port_info *pi_template;
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
int rc; int rc;
@ -444,7 +411,7 @@ static int ahci_probe(struct platform_device *pdev)
if (pdata && pdata->ata_port_info) if (pdata && pdata->ata_port_info)
pi_template = pdata->ata_port_info; pi_template = pdata->ata_port_info;
else else
pi_template = &ahci_port_info[id ? id->driver_data : 0]; pi_template = &ahci_port_info;
rc = ahci_platform_init_host(pdev, hpriv, pi_template, rc = ahci_platform_init_host(pdev, hpriv, pi_template,
pdata ? pdata->force_port_map : 0, pdata ? pdata->force_port_map : 0,
@ -638,7 +605,6 @@ static struct platform_driver ahci_driver = {
.of_match_table = ahci_of_match, .of_match_table = ahci_of_match,
.pm = &ahci_pm_ops, .pm = &ahci_pm_ops,
}, },
.id_table = ahci_devtype,
}; };
module_platform_driver(ahci_driver); module_platform_driver(ahci_driver);