tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mtd: maps: 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: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

authored by

Jingoo Han and committed by
David Woodhouse d20d5a57 0278fd3f

+16 -16
+1 -1
drivers/mtd/maps/bfin-async-flash.c
··· 128 128 static int bfin_flash_probe(struct platform_device *pdev) 129 129 { 130 130 int ret; 131 - struct physmap_flash_data *pdata = pdev->dev.platform_data; 131 + struct physmap_flash_data *pdata = dev_get_platdata(&pdev->dev); 132 132 struct resource *memory = platform_get_resource(pdev, IORESOURCE_MEM, 0); 133 133 struct resource *flash_ambctl = platform_get_resource(pdev, IORESOURCE_MEM, 1); 134 134 struct async_state *state;
+1 -1
drivers/mtd/maps/gpio-addr-flash.c
··· 196 196 struct resource *gpios; 197 197 struct async_state *state; 198 198 199 - pdata = pdev->dev.platform_data; 199 + pdata = dev_get_platdata(&pdev->dev); 200 200 memory = platform_get_resource(pdev, IORESOURCE_MEM, 0); 201 201 gpios = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 202 202
+2 -2
drivers/mtd/maps/ixp4xx.c
··· 152 152 153 153 static int ixp4xx_flash_remove(struct platform_device *dev) 154 154 { 155 - struct flash_platform_data *plat = dev->dev.platform_data; 155 + struct flash_platform_data *plat = dev_get_platdata(&dev->dev); 156 156 struct ixp4xx_flash_info *info = platform_get_drvdata(dev); 157 157 158 158 if(!info) ··· 178 178 179 179 static int ixp4xx_flash_probe(struct platform_device *dev) 180 180 { 181 - struct flash_platform_data *plat = dev->dev.platform_data; 181 + struct flash_platform_data *plat = dev_get_platdata(&dev->dev); 182 182 struct ixp4xx_flash_info *info; 183 183 struct mtd_part_parser_data ppdata = { 184 184 .origin = dev->resource->start,
+2 -2
drivers/mtd/maps/latch-addr-flash.c
··· 103 103 if (info == NULL) 104 104 return 0; 105 105 106 - latch_addr_data = dev->dev.platform_data; 106 + latch_addr_data = dev_get_platdata(&dev->dev); 107 107 108 108 if (info->mtd != NULL) { 109 109 mtd_device_unregister(info->mtd); ··· 134 134 int chipsel; 135 135 int err; 136 136 137 - latch_addr_data = dev->dev.platform_data; 137 + latch_addr_data = dev_get_platdata(&dev->dev); 138 138 if (latch_addr_data == NULL) 139 139 return -ENODEV; 140 140
+3 -3
drivers/mtd/maps/physmap.c
··· 41 41 if (info == NULL) 42 42 return 0; 43 43 44 - physmap_data = dev->dev.platform_data; 44 + physmap_data = dev_get_platdata(&dev->dev); 45 45 46 46 if (info->cmtd) { 47 47 mtd_device_unregister(info->cmtd); ··· 68 68 unsigned long flags; 69 69 70 70 pdev = (struct platform_device *)map->map_priv_1; 71 - physmap_data = pdev->dev.platform_data; 71 + physmap_data = dev_get_platdata(&pdev->dev); 72 72 73 73 if (!physmap_data->set_vpp) 74 74 return; ··· 102 102 int i; 103 103 int devices_found = 0; 104 104 105 - physmap_data = dev->dev.platform_data; 105 + physmap_data = dev_get_platdata(&dev->dev); 106 106 if (physmap_data == NULL) 107 107 return -ENODEV; 108 108
+2 -2
drivers/mtd/maps/plat-ram.c
··· 128 128 129 129 dev_dbg(&pdev->dev, "probe entered\n"); 130 130 131 - if (pdev->dev.platform_data == NULL) { 131 + if (dev_get_platdata(&pdev->dev) == NULL) { 132 132 dev_err(&pdev->dev, "no platform data supplied\n"); 133 133 err = -ENOENT; 134 134 goto exit_error; 135 135 } 136 136 137 - pdata = pdev->dev.platform_data; 137 + pdata = dev_get_platdata(&pdev->dev); 138 138 139 139 info = kzalloc(sizeof(*info), GFP_KERNEL); 140 140 if (info == NULL) {
+1 -1
drivers/mtd/maps/pxa2xx-flash.c
··· 49 49 50 50 static int pxa2xx_flash_probe(struct platform_device *pdev) 51 51 { 52 - struct flash_platform_data *flash = pdev->dev.platform_data; 52 + struct flash_platform_data *flash = dev_get_platdata(&pdev->dev); 53 53 struct pxa2xx_flash_info *info; 54 54 struct resource *res; 55 55
+2 -2
drivers/mtd/maps/rbtx4939-flash.c
··· 36 36 return 0; 37 37 38 38 if (info->mtd) { 39 - struct rbtx4939_flash_data *pdata = dev->dev.platform_data; 39 + struct rbtx4939_flash_data *pdata = dev_get_platdata(&dev->dev); 40 40 41 41 mtd_device_unregister(info->mtd); 42 42 map_destroy(info->mtd); ··· 56 56 int err = 0; 57 57 unsigned long size; 58 58 59 - pdata = dev->dev.platform_data; 59 + pdata = dev_get_platdata(&dev->dev); 60 60 if (!pdata) 61 61 return -ENODEV; 62 62
+2 -2
drivers/mtd/maps/sa1100-flash.c
··· 248 248 249 249 static int sa1100_mtd_probe(struct platform_device *pdev) 250 250 { 251 - struct flash_platform_data *plat = pdev->dev.platform_data; 251 + struct flash_platform_data *plat = dev_get_platdata(&pdev->dev); 252 252 struct sa_info *info; 253 253 int err; 254 254 ··· 277 277 static int __exit sa1100_mtd_remove(struct platform_device *pdev) 278 278 { 279 279 struct sa_info *info = platform_get_drvdata(pdev); 280 - struct flash_platform_data *plat = pdev->dev.platform_data; 280 + struct flash_platform_data *plat = dev_get_platdata(&pdev->dev); 281 281 282 282 sa1100_destroy(info, plat); 283 283