summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-07-30 04:16:47 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-05 15:21:29 -0400
commit7b6b5612380c829ea026c4a3ff427d362f46a1d9 (patch)
tree8986268bc56d0fcfdd16ac224897134a67e8ad67 /drivers/ide
parent6fcf0497ffcc18c18991b81cf5e4c388264df938 (diff)
ide: use dev_get_platdata()
Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/gayle.c2
-rw-r--r--drivers/ide/ide_platform.c2
-rw-r--r--drivers/ide/tx4938ide.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c
index 0a8440ae0565..97a2f9dc75d8 100644
--- a/drivers/ide/gayle.c
+++ b/drivers/ide/gayle.c
@@ -132,7 +132,7 @@ static int __init amiga_gayle_ide_probe(struct platform_device *pdev)
132 if (!request_mem_region(res->start, resource_size(res), "IDE")) 132 if (!request_mem_region(res->start, resource_size(res), "IDE"))
133 return -EBUSY; 133 return -EBUSY;
134 134
135 pdata = pdev->dev.platform_data; 135 pdata = dev_get_platdata(&pdev->dev);
136 pr_info("ide: Gayle IDE controller (A%u style%s)\n", 136 pr_info("ide: Gayle IDE controller (A%u style%s)\n",
137 pdata->explicit_ack ? 1200 : 4000, 137 pdata->explicit_ack ? 1200 : 4000,
138 ide_doubler ? ", IDE doubler" : ""); 138 ide_doubler ? ", IDE doubler" : "");
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c
index ba4bfbead24b..a8b4b6af80e7 100644
--- a/drivers/ide/ide_platform.c
+++ b/drivers/ide/ide_platform.c
@@ -56,7 +56,7 @@ static int plat_ide_probe(struct platform_device *pdev)
56 struct ide_hw hw, *hws[] = { &hw }; 56 struct ide_hw hw, *hws[] = { &hw };
57 struct ide_port_info d = platform_ide_port_info; 57 struct ide_port_info d = platform_ide_port_info;
58 58
59 pdata = pdev->dev.platform_data; 59 pdata = dev_get_platdata(&pdev->dev);
60 60
61 /* get a pointer to the register memory */ 61 /* get a pointer to the register memory */
62 res_base = platform_get_resource(pdev, IORESOURCE_IO, 0); 62 res_base = platform_get_resource(pdev, IORESOURCE_IO, 0);
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index ede8575ac7d5..68edd4f58a28 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -58,7 +58,7 @@ static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
58 58
59static void tx4938ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) 59static void tx4938ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
60{ 60{
61 struct tx4938ide_platform_info *pdata = hwif->dev->platform_data; 61 struct tx4938ide_platform_info *pdata = dev_get_platdata(hwif->dev);
62 u8 safe = drive->pio_mode - XFER_PIO_0; 62 u8 safe = drive->pio_mode - XFER_PIO_0;
63 ide_drive_t *pair; 63 ide_drive_t *pair;
64 64
@@ -132,7 +132,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
132 struct ide_hw hw, *hws[] = { &hw }; 132 struct ide_hw hw, *hws[] = { &hw };
133 struct ide_host *host; 133 struct ide_host *host;
134 struct resource *res; 134 struct resource *res;
135 struct tx4938ide_platform_info *pdata = pdev->dev.platform_data; 135 struct tx4938ide_platform_info *pdata = dev_get_platdata(&pdev->dev);
136 int irq, ret, i; 136 int irq, ret, i;
137 unsigned long mapbase, mapctl; 137 unsigned long mapbase, mapctl;
138 struct ide_port_info d = tx4938ide_port_info; 138 struct ide_port_info d = tx4938ide_port_info;