From 895c09a42a6e5454e850b9991de29996e97bfcd7 Mon Sep 17 00:00:00 2001 From: JiSheng Zhang Date: Mon, 31 Oct 2011 21:20:10 +0800 Subject: [PATCH] --- yaml --- r: 275333 b: refs/heads/master c: 003456145f0d23b73f080abd1fd7981788438693 h: refs/heads/master i: 275331: 5387d69a460dc2d9bd9278cb3c330a6b87b94ed7 v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci_platform.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb4c66280dfb..097078ca3862 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d2dd054295e26dad0a84e2fe2029a1428242f8b +refs/heads/master: 003456145f0d23b73f080abd1fd7981788438693 diff --git a/trunk/drivers/ata/ahci_platform.c b/trunk/drivers/ata/ahci_platform.c index 004f2ce3dc73..ec555951176e 100644 --- a/trunk/drivers/ata/ahci_platform.c +++ b/trunk/drivers/ata/ahci_platform.c @@ -65,7 +65,7 @@ static struct scsi_host_template ahci_platform_sht = { static int __init ahci_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct ahci_platform_data *pdata = dev->platform_data; + struct ahci_platform_data *pdata = dev_get_platdata(dev); const struct platform_device_id *id = platform_get_device_id(pdev); struct ata_port_info pi = ahci_port_info[id->driver_data]; const struct ata_port_info *ppi[] = { &pi, NULL }; @@ -191,7 +191,7 @@ static int __init ahci_probe(struct platform_device *pdev) static int __devexit ahci_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct ahci_platform_data *pdata = dev->platform_data; + struct ahci_platform_data *pdata = dev_get_platdata(dev); struct ata_host *host = dev_get_drvdata(dev); ata_host_detach(host);