diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-30 04:16:05 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-07-30 08:59:24 -0400 |
commit | 61b8c345aa8c50c6a99a90560a107d02124f0293 (patch) | |
tree | 7e7c8cd598333b4f1c7deb817af07af38f1f45be | |
parent | e8038ebbd51df65bf5f4728c190397041a42e903 (diff) |
ata: 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: Tejun Heo <tj@kernel.org>
-rw-r--r-- | drivers/ata/pata_at32.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_at91.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_ixp4xx_cf.c | 4 | ||||
-rw-r--r-- | drivers/ata/pata_octeon_cf.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_platform.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_pxa.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_samsung_cf.c | 4 | ||||
-rw-r--r-- | drivers/ata/sata_mv.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 8d493b4a0961..d59d5239405f 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
@@ -271,7 +271,7 @@ static int __init pata_at32_probe(struct platform_device *pdev) | |||
271 | 271 | ||
272 | struct device *dev = &pdev->dev; | 272 | struct device *dev = &pdev->dev; |
273 | struct at32_ide_info *info; | 273 | struct at32_ide_info *info; |
274 | struct ide_platform_data *board = pdev->dev.platform_data; | 274 | struct ide_platform_data *board = dev_get_platdata(&pdev->dev); |
275 | struct resource *res; | 275 | struct resource *res; |
276 | 276 | ||
277 | int irq; | 277 | int irq; |
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c index 5364f97b42c6..d63ee8f41a4f 100644 --- a/drivers/ata/pata_at91.c +++ b/drivers/ata/pata_at91.c | |||
@@ -315,7 +315,7 @@ static struct ata_port_operations pata_at91_port_ops = { | |||
315 | 315 | ||
316 | static int pata_at91_probe(struct platform_device *pdev) | 316 | static int pata_at91_probe(struct platform_device *pdev) |
317 | { | 317 | { |
318 | struct at91_cf_data *board = pdev->dev.platform_data; | 318 | struct at91_cf_data *board = dev_get_platdata(&pdev->dev); |
319 | struct device *dev = &pdev->dev; | 319 | struct device *dev = &pdev->dev; |
320 | struct at91_ide_info *info; | 320 | struct at91_ide_info *info; |
321 | struct resource *mem_res; | 321 | struct resource *mem_res; |
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c index dcc6b243e525..1ec53f8ca96f 100644 --- a/drivers/ata/pata_ixp4xx_cf.c +++ b/drivers/ata/pata_ixp4xx_cf.c | |||
@@ -48,7 +48,7 @@ static unsigned int ixp4xx_mmio_data_xfer(struct ata_device *dev, | |||
48 | u16 *buf16 = (u16 *) buf; | 48 | u16 *buf16 = (u16 *) buf; |
49 | struct ata_port *ap = dev->link->ap; | 49 | struct ata_port *ap = dev->link->ap; |
50 | void __iomem *mmio = ap->ioaddr.data_addr; | 50 | void __iomem *mmio = ap->ioaddr.data_addr; |
51 | struct ixp4xx_pata_data *data = ap->host->dev->platform_data; | 51 | struct ixp4xx_pata_data *data = dev_get_platdata(ap->host->dev); |
52 | 52 | ||
53 | /* set the expansion bus in 16bit mode and restore | 53 | /* set the expansion bus in 16bit mode and restore |
54 | * 8 bit mode after the transaction. | 54 | * 8 bit mode after the transaction. |
@@ -143,7 +143,7 @@ static int ixp4xx_pata_probe(struct platform_device *pdev) | |||
143 | struct resource *cs0, *cs1; | 143 | struct resource *cs0, *cs1; |
144 | struct ata_host *host; | 144 | struct ata_host *host; |
145 | struct ata_port *ap; | 145 | struct ata_port *ap; |
146 | struct ixp4xx_pata_data *data = pdev->dev.platform_data; | 146 | struct ixp4xx_pata_data *data = dev_get_platdata(&pdev->dev); |
147 | 147 | ||
148 | cs0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 148 | cs0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
149 | cs1 = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 149 | cs1 = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index e73bef3093d2..c51bbb9ea8e8 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c | |||
@@ -1037,7 +1037,7 @@ static void octeon_cf_shutdown(struct device *dev) | |||
1037 | union cvmx_mio_boot_dma_cfgx dma_cfg; | 1037 | union cvmx_mio_boot_dma_cfgx dma_cfg; |
1038 | union cvmx_mio_boot_dma_intx dma_int; | 1038 | union cvmx_mio_boot_dma_intx dma_int; |
1039 | 1039 | ||
1040 | struct octeon_cf_port *cf_port = dev->platform_data; | 1040 | struct octeon_cf_port *cf_port = dev_get_platdata(dev); |
1041 | 1041 | ||
1042 | if (cf_port->dma_base) { | 1042 | if (cf_port->dma_base) { |
1043 | /* Stop and clear the dma engine. */ | 1043 | /* Stop and clear the dma engine. */ |
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c index 71e093767f4e..02794885de10 100644 --- a/drivers/ata/pata_platform.c +++ b/drivers/ata/pata_platform.c | |||
@@ -180,7 +180,7 @@ static int pata_platform_probe(struct platform_device *pdev) | |||
180 | struct resource *io_res; | 180 | struct resource *io_res; |
181 | struct resource *ctl_res; | 181 | struct resource *ctl_res; |
182 | struct resource *irq_res; | 182 | struct resource *irq_res; |
183 | struct pata_platform_info *pp_info = pdev->dev.platform_data; | 183 | struct pata_platform_info *pp_info = dev_get_platdata(&pdev->dev); |
184 | 184 | ||
185 | /* | 185 | /* |
186 | * Simple resource validation .. | 186 | * Simple resource validation .. |
diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c index 942ef94b29e6..a6f05acad61e 100644 --- a/drivers/ata/pata_pxa.c +++ b/drivers/ata/pata_pxa.c | |||
@@ -238,7 +238,7 @@ static int pxa_ata_probe(struct platform_device *pdev) | |||
238 | struct resource *ctl_res; | 238 | struct resource *ctl_res; |
239 | struct resource *dma_res; | 239 | struct resource *dma_res; |
240 | struct resource *irq_res; | 240 | struct resource *irq_res; |
241 | struct pata_pxa_pdata *pdata = pdev->dev.platform_data; | 241 | struct pata_pxa_pdata *pdata = dev_get_platdata(&pdev->dev); |
242 | int ret = 0; | 242 | int ret = 0; |
243 | 243 | ||
244 | /* | 244 | /* |
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index 6ef27e98c508..951aa951ffdb 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c | |||
@@ -475,7 +475,7 @@ static void pata_s3c_hwinit(struct s3c_ide_info *info, | |||
475 | 475 | ||
476 | static int __init pata_s3c_probe(struct platform_device *pdev) | 476 | static int __init pata_s3c_probe(struct platform_device *pdev) |
477 | { | 477 | { |
478 | struct s3c_ide_platdata *pdata = pdev->dev.platform_data; | 478 | struct s3c_ide_platdata *pdata = dev_get_platdata(&pdev->dev); |
479 | struct device *dev = &pdev->dev; | 479 | struct device *dev = &pdev->dev; |
480 | struct s3c_ide_info *info; | 480 | struct s3c_ide_info *info; |
481 | struct resource *res; | 481 | struct resource *res; |
@@ -617,7 +617,7 @@ static int pata_s3c_resume(struct device *dev) | |||
617 | { | 617 | { |
618 | struct platform_device *pdev = to_platform_device(dev); | 618 | struct platform_device *pdev = to_platform_device(dev); |
619 | struct ata_host *host = platform_get_drvdata(pdev); | 619 | struct ata_host *host = platform_get_drvdata(pdev); |
620 | struct s3c_ide_platdata *pdata = pdev->dev.platform_data; | 620 | struct s3c_ide_platdata *pdata = dev_get_platdata(&pdev->dev); |
621 | struct s3c_ide_info *info = host->private_data; | 621 | struct s3c_ide_info *info = host->private_data; |
622 | 622 | ||
623 | pata_s3c_hwinit(info, pdata); | 623 | pata_s3c_hwinit(info, pdata); |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 10ea99a0192d..88e08515cf46 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -4058,7 +4058,7 @@ static int mv_platform_probe(struct platform_device *pdev) | |||
4058 | of_property_read_u32(pdev->dev.of_node, "nr-ports", &n_ports); | 4058 | of_property_read_u32(pdev->dev.of_node, "nr-ports", &n_ports); |
4059 | irq = irq_of_parse_and_map(pdev->dev.of_node, 0); | 4059 | irq = irq_of_parse_and_map(pdev->dev.of_node, 0); |
4060 | } else { | 4060 | } else { |
4061 | mv_platform_data = pdev->dev.platform_data; | 4061 | mv_platform_data = dev_get_platdata(&pdev->dev); |
4062 | n_ports = mv_platform_data->n_ports; | 4062 | n_ports = mv_platform_data->n_ports; |
4063 | irq = platform_get_irq(pdev, 0); | 4063 | irq = platform_get_irq(pdev, 0); |
4064 | } | 4064 | } |