Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 334a41ce9b753ec615e8c6c50ee07d6197190610

Authored by Jingoo Han
Committed by Lee Jones
1 parent 3e4f878994
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

mfd: 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: Lee Jones <lee.jones@linaro.org>

Showing 58 changed files with 89 additions and 88 deletions Side-by-side Diff

drivers/mfd/88pm800.c
Diff comments   View file @ 334a41c
... ... @@ -541,7 +541,7 @@
541 541 {
542 542 int ret = 0;
543 543 struct pm80x_chip *chip;
544   - struct pm80x_platform_data *pdata = client->dev.platform_data;
  544 + struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);
545 545 struct pm80x_subchip *subchip;
546 546  
547 547 ret = pm80x_init(client);
drivers/mfd/88pm805.c
Diff comments   View file @ 334a41c
... ... @@ -227,7 +227,7 @@
227 227 {
228 228 int ret = 0;
229 229 struct pm80x_chip *chip;
230   - struct pm80x_platform_data *pdata = client->dev.platform_data;
  230 + struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);
231 231  
232 232 ret = pm80x_init(client);
233 233 if (ret) {
drivers/mfd/88pm860x-core.c
Diff comments   View file @ 334a41c
... ... @@ -1130,7 +1130,7 @@
1130 1130 static int pm860x_probe(struct i2c_client *client,
1131 1131 const struct i2c_device_id *id)
1132 1132 {
1133   - struct pm860x_platform_data *pdata = client->dev.platform_data;
  1133 + struct pm860x_platform_data *pdata = dev_get_platdata(&client->dev);
1134 1134 struct device_node *node = client->dev.of_node;
1135 1135 struct pm860x_chip *chip;
1136 1136 int ret;
drivers/mfd/aat2870-core.c
Diff comments   View file @ 334a41c
... ... @@ -363,7 +363,7 @@
363 363 static int aat2870_i2c_probe(struct i2c_client *client,
364 364 const struct i2c_device_id *id)
365 365 {
366   - struct aat2870_platform_data *pdata = client->dev.platform_data;
  366 + struct aat2870_platform_data *pdata = dev_get_platdata(&client->dev);
367 367 struct aat2870_data *aat2870;
368 368 int i, j;
369 369 int ret = 0;
drivers/mfd/ab3100-core.c
Diff comments   View file @ 334a41c
... ... @@ -854,7 +854,7 @@
854 854 {
855 855 struct ab3100 *ab3100;
856 856 struct ab3100_platform_data *ab3100_plf_data =
857   - client->dev.platform_data;
  857 + dev_get_platdata(&client->dev);
858 858 int err;
859 859 int i;
860 860  
drivers/mfd/adp5520.c
Diff comments   View file @ 334a41c
... ... @@ -207,7 +207,7 @@
207 207 static int adp5520_probe(struct i2c_client *client,
208 208 const struct i2c_device_id *id)
209 209 {
210   - struct adp5520_platform_data *pdata = client->dev.platform_data;
  210 + struct adp5520_platform_data *pdata = dev_get_platdata(&client->dev);
211 211 struct platform_device *pdev;
212 212 struct adp5520_chip *chip;
213 213 int ret;
drivers/mfd/as3711.c
Diff comments   View file @ 334a41c
... ... @@ -129,7 +129,7 @@
129 129 int ret;
130 130  
131 131 if (!client->dev.of_node) {
132   - pdata = client->dev.platform_data;
  132 + pdata = dev_get_platdata(&client->dev);
133 133 if (!pdata)
134 134 dev_dbg(&client->dev, "Platform data not found\n");
135 135 } else {
... ... @@ -952,7 +952,7 @@
952 952 /* Core */
953 953 static int __init asic3_probe(struct platform_device *pdev)
954 954 {
955   - struct asic3_platform_data *pdata = pdev->dev.platform_data;
  955 + struct asic3_platform_data *pdata = dev_get_platdata(&pdev->dev);
956 956 struct asic3 *asic;
957 957 struct resource *mem;
958 958 unsigned long clksel;
drivers/mfd/da903x.c
Diff comments   View file @ 334a41c
... ... @@ -494,7 +494,7 @@
494 494 static int da903x_probe(struct i2c_client *client,
495 495 const struct i2c_device_id *id)
496 496 {
497   - struct da903x_platform_data *pdata = client->dev.platform_data;
  497 + struct da903x_platform_data *pdata = dev_get_platdata(&client->dev);
498 498 struct da903x_chip *chip;
499 499 unsigned int tmp;
500 500 int ret;
drivers/mfd/da9052-core.c
Diff comments   View file @ 334a41c
... ... @@ -534,7 +534,7 @@
534 534  
535 535 int da9052_device_init(struct da9052 *da9052, u8 chip_id)
536 536 {
537   - struct da9052_pdata *pdata = da9052->dev->platform_data;
  537 + struct da9052_pdata *pdata = dev_get_platdata(da9052->dev);
538 538 int ret;
539 539  
540 540 mutex_init(&da9052->auxadc_lock);
drivers/mfd/da9055-core.c
Diff comments   View file @ 334a41c
... ... @@ -379,7 +379,7 @@
379 379  
380 380 int da9055_device_init(struct da9055 *da9055)
381 381 {
382   - struct da9055_pdata *pdata = da9055->dev->platform_data;
  382 + struct da9055_pdata *pdata = dev_get_platdata(da9055->dev);
383 383 int ret;
384 384 uint8_t clear_events[3] = {0xFF, 0xFF, 0xFF};
385 385  
drivers/mfd/dm355evm_msp.c
Diff comments   View file @ 334a41c
... ... @@ -315,8 +315,8 @@
315 315 }
316 316  
317 317 /* MMC/SD inputs -- right after the last config input */
318   - if (client->dev.platform_data) {
319   - void (*mmcsd_setup)(unsigned) = client->dev.platform_data;
  318 + if (dev_get_platdata(&client->dev)) {
  319 + void (*mmcsd_setup)(unsigned) = dev_get_platdata(&client->dev);
320 320  
321 321 mmcsd_setup(dm355evm_msp_gpio.base + 8 + 5);
322 322 }
drivers/mfd/ezx-pcap.c
Diff comments   View file @ 334a41c
... ... @@ -177,7 +177,7 @@
177 177 static void pcap_isr_work(struct work_struct *work)
178 178 {
179 179 struct pcap_chip *pcap = container_of(work, struct pcap_chip, isr_work);
180   - struct pcap_platform_data *pdata = pcap->spi->dev.platform_data;
  180 + struct pcap_platform_data *pdata = dev_get_platdata(&pcap->spi->dev);
181 181 u32 msr, isr, int_sel, service;
182 182 int irq;
183 183  
... ... @@ -394,7 +394,7 @@
394 394 static int ezx_pcap_remove(struct spi_device *spi)
395 395 {
396 396 struct pcap_chip *pcap = spi_get_drvdata(spi);
397   - struct pcap_platform_data *pdata = spi->dev.platform_data;
  397 + struct pcap_platform_data *pdata = dev_get_platdata(&spi->dev);
398 398 int i, adc_irq;
399 399  
400 400 /* remove all registered subdevs */
... ... @@ -420,7 +420,7 @@
420 420  
421 421 static int ezx_pcap_probe(struct spi_device *spi)
422 422 {
423   - struct pcap_platform_data *pdata = spi->dev.platform_data;
  423 + struct pcap_platform_data *pdata = dev_get_platdata(&spi->dev);
424 424 struct pcap_chip *pcap;
425 425 int i, adc_irq;
426 426 int ret = -ENODEV;
drivers/mfd/htc-egpio.c
Diff comments   View file @ 334a41c
... ... @@ -261,7 +261,7 @@
261 261  
262 262 static int __init egpio_probe(struct platform_device *pdev)
263 263 {
264   - struct htc_egpio_platform_data *pdata = pdev->dev.platform_data;
  264 + struct htc_egpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
265 265 struct resource *res;
266 266 struct egpio_info *ei;
267 267 struct gpio_chip *chip;
drivers/mfd/htc-i2cpld.c
Diff comments   View file @ 334a41c
... ... @@ -340,7 +340,7 @@
340 340 int ret = 0;
341 341  
342 342 /* Get the platform and driver data */
343   - pdata = dev->platform_data;
  343 + pdata = dev_get_platdata(dev);
344 344 htcpld = platform_get_drvdata(pdev);
345 345 chip = &htcpld->chip[chip_index];
346 346 plat_chip_data = &pdata->chip[chip_index];
... ... @@ -375,7 +375,7 @@
375 375 struct i2c_board_info info;
376 376  
377 377 /* Get the platform and driver data */
378   - pdata = dev->platform_data;
  378 + pdata = dev_get_platdata(dev);
379 379 htcpld = platform_get_drvdata(pdev);
380 380 chip = &htcpld->chip[chip_index];
381 381 plat_chip_data = &pdata->chip[chip_index];
... ... @@ -447,7 +447,7 @@
447 447 int ret = 0;
448 448  
449 449 /* Get the platform and driver data */
450   - pdata = dev->platform_data;
  450 + pdata = dev_get_platdata(dev);
451 451 htcpld = platform_get_drvdata(pdev);
452 452 chip = &htcpld->chip[chip_index];
453 453 plat_chip_data = &pdata->chip[chip_index];
... ... @@ -509,7 +509,7 @@
509 509 int i;
510 510  
511 511 /* Get the platform and driver data */
512   - pdata = dev->platform_data;
  512 + pdata = dev_get_platdata(dev);
513 513 htcpld = platform_get_drvdata(pdev);
514 514  
515 515 /* Setup each chip's output GPIOs */
... ... @@ -574,7 +574,7 @@
574 574 if (!dev)
575 575 return -ENODEV;
576 576  
577   - pdata = dev->platform_data;
  577 + pdata = dev_get_platdata(dev);
578 578 if (!pdata) {
579 579 dev_warn(dev, "Platform data not found for htcpld core!\n");
580 580 return -ENXIO;
drivers/mfd/htc-pasic3.c
Diff comments   View file @ 334a41c
... ... @@ -126,7 +126,7 @@
126 126  
127 127 static int __init pasic3_probe(struct platform_device *pdev)
128 128 {
129   - struct pasic3_platform_data *pdata = pdev->dev.platform_data;
  129 + struct pasic3_platform_data *pdata = dev_get_platdata(&pdev->dev);
130 130 struct device *dev = &pdev->dev;
131 131 struct pasic3_data *asic;
132 132 struct resource *r;
drivers/mfd/intel_msic.c
Diff comments   View file @ 334a41c
... ... @@ -310,7 +310,7 @@
310 310 static int intel_msic_init_devices(struct intel_msic *msic)
311 311 {
312 312 struct platform_device *pdev = msic->pdev;
313   - struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
  313 + struct intel_msic_platform_data *pdata = dev_get_platdata(&pdev->dev);
314 314 int ret, i;
315 315  
316 316 if (pdata->gpio) {
... ... @@ -372,7 +372,7 @@
372 372  
373 373 static int intel_msic_probe(struct platform_device *pdev)
374 374 {
375   - struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
  375 + struct intel_msic_platform_data *pdata = dev_get_platdata(&pdev->dev);
376 376 struct intel_msic *msic;
377 377 struct resource *res;
378 378 u8 id0, id1;
drivers/mfd/kempld-core.c
Diff comments   View file @ 334a41c
... ... @@ -258,7 +258,7 @@
258 258 */
259 259 void kempld_get_mutex(struct kempld_device_data *pld)
260 260 {
261   - struct kempld_platform_data *pdata = pld->dev->platform_data;
  261 + struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
262 262  
263 263 mutex_lock(&pld->lock);
264 264 pdata->get_hardware_mutex(pld);
... ... @@ -271,7 +271,7 @@
271 271 */
272 272 void kempld_release_mutex(struct kempld_device_data *pld)
273 273 {
274   - struct kempld_platform_data *pdata = pld->dev->platform_data;
  274 + struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
275 275  
276 276 pdata->release_hardware_mutex(pld);
277 277 mutex_unlock(&pld->lock);
... ... @@ -288,7 +288,7 @@
288 288 */
289 289 static int kempld_get_info(struct kempld_device_data *pld)
290 290 {
291   - struct kempld_platform_data *pdata = pld->dev->platform_data;
  291 + struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
292 292  
293 293 return pdata->get_info(pld);
294 294 }
... ... @@ -302,7 +302,7 @@
302 302 */
303 303 static int kempld_register_cells(struct kempld_device_data *pld)
304 304 {
305   - struct kempld_platform_data *pdata = pld->dev->platform_data;
  305 + struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
306 306  
307 307 return pdata->register_cells(pld);
308 308 }
... ... @@ -357,7 +357,7 @@
357 357  
358 358 static int kempld_probe(struct platform_device *pdev)
359 359 {
360   - struct kempld_platform_data *pdata = pdev->dev.platform_data;
  360 + struct kempld_platform_data *pdata = dev_get_platdata(&pdev->dev);
361 361 struct device *dev = &pdev->dev;
362 362 struct kempld_device_data *pld;
363 363 struct resource *ioport;
... ... @@ -394,7 +394,7 @@
394 394 static int kempld_remove(struct platform_device *pdev)
395 395 {
396 396 struct kempld_device_data *pld = platform_get_drvdata(pdev);
397   - struct kempld_platform_data *pdata = pld->dev->platform_data;
  397 + struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
398 398  
399 399 mfd_remove_devices(&pdev->dev);
400 400 pdata->release_hardware_mutex(pld);
drivers/mfd/lm3533-core.c
Diff comments   View file @ 334a41c
... ... @@ -384,7 +384,7 @@
384 384  
385 385 static int lm3533_device_als_init(struct lm3533 *lm3533)
386 386 {
387   - struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
  387 + struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
388 388 int ret;
389 389  
390 390 if (!pdata->als)
... ... @@ -407,7 +407,7 @@
407 407  
408 408 static int lm3533_device_bl_init(struct lm3533 *lm3533)
409 409 {
410   - struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
  410 + struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
411 411 int i;
412 412 int ret;
413 413  
... ... @@ -436,7 +436,7 @@
436 436  
437 437 static int lm3533_device_led_init(struct lm3533 *lm3533)
438 438 {
439   - struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
  439 + struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
440 440 int i;
441 441 int ret;
442 442  
... ... @@ -481,7 +481,7 @@
481 481  
482 482 static int lm3533_device_init(struct lm3533 *lm3533)
483 483 {
484   - struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
  484 + struct lm3533_platform_data *pdata = dev_get_platdata(lm3533->dev);
485 485 int ret;
486 486  
487 487 dev_dbg(lm3533->dev, "%s\n", __func__);
drivers/mfd/lp8788.c
Diff comments   View file @ 334a41c
... ... @@ -173,7 +173,7 @@
173 173 static int lp8788_probe(struct i2c_client *cl, const struct i2c_device_id *id)
174 174 {
175 175 struct lp8788 *lp;
176   - struct lp8788_platform_data *pdata = cl->dev.platform_data;
  176 + struct lp8788_platform_data *pdata = dev_get_platdata(&cl->dev);
177 177 int ret;
178 178  
179 179 lp = devm_kzalloc(&cl->dev, sizeof(struct lp8788), GFP_KERNEL);
drivers/mfd/max77686.c
Diff comments   View file @ 334a41c
... ... @@ -77,7 +77,7 @@
77 77 const struct i2c_device_id *id)
78 78 {
79 79 struct max77686_dev *max77686 = NULL;
80   - struct max77686_platform_data *pdata = i2c->dev.platform_data;
  80 + struct max77686_platform_data *pdata = dev_get_platdata(&i2c->dev);
81 81 unsigned int data;
82 82 int ret = 0;
83 83  
drivers/mfd/max77693.c
Diff comments   View file @ 334a41c
... ... @@ -110,7 +110,7 @@
110 110 const struct i2c_device_id *id)
111 111 {
112 112 struct max77693_dev *max77693;
113   - struct max77693_platform_data *pdata = i2c->dev.platform_data;
  113 + struct max77693_platform_data *pdata = dev_get_platdata(&i2c->dev);
114 114 u8 reg_data;
115 115 int ret = 0;
116 116  
drivers/mfd/max8925-i2c.c
Diff comments   View file @ 334a41c
... ... @@ -151,7 +151,7 @@
151 151 static int max8925_probe(struct i2c_client *client,
152 152 const struct i2c_device_id *id)
153 153 {
154   - struct max8925_platform_data *pdata = client->dev.platform_data;
  154 + struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
155 155 static struct max8925_chip *chip;
156 156 struct device_node *node = client->dev.of_node;
157 157  
drivers/mfd/max8997.c
Diff comments   View file @ 334a41c
... ... @@ -188,7 +188,7 @@
188 188 const struct i2c_device_id *id)
189 189 {
190 190 struct max8997_dev *max8997;
191   - struct max8997_platform_data *pdata = i2c->dev.platform_data;
  191 + struct max8997_platform_data *pdata = dev_get_platdata(&i2c->dev);
192 192 int ret = 0;
193 193  
194 194 max8997 = kzalloc(sizeof(struct max8997_dev), GFP_KERNEL);
drivers/mfd/max8998.c
Diff comments   View file @ 334a41c
... ... @@ -184,7 +184,7 @@
184 184 static int max8998_i2c_probe(struct i2c_client *i2c,
185 185 const struct i2c_device_id *id)
186 186 {
187   - struct max8998_platform_data *pdata = i2c->dev.platform_data;
  187 + struct max8998_platform_data *pdata = dev_get_platdata(&i2c->dev);
188 188 struct max8998_dev *max8998;
189 189 int ret = 0;
190 190  
drivers/mfd/mcp-sa11x0.c
Diff comments   View file @ 334a41c
... ... @@ -156,7 +156,7 @@
156 156  
157 157 static int mcp_sa11x0_probe(struct platform_device *dev)
158 158 {
159   - struct mcp_plat_data *data = dev->dev.platform_data;
  159 + struct mcp_plat_data *data = dev_get_platdata(&dev->dev);
160 160 struct resource *mem0, *mem1;
161 161 struct mcp_sa11x0 *m;
162 162 struct mcp *mcp;
drivers/mfd/menelaus.c
Diff comments   View file @ 334a41c
... ... @@ -1189,7 +1189,7 @@
1189 1189 int rev = 0, val;
1190 1190 int err = 0;
1191 1191 struct menelaus_platform_data *menelaus_pdata =
1192   - client->dev.platform_data;
  1192 + dev_get_platdata(&client->dev);
1193 1193  
1194 1194 if (the_menelaus) {
1195 1195 dev_dbg(&client->dev, "only one %s for now\n",
drivers/mfd/omap-usb-host.c
Diff comments   View file @ 334a41c
... ... @@ -232,7 +232,7 @@
232 232 static int omap_usbhs_alloc_children(struct platform_device *pdev)
233 233 {
234 234 struct device *dev = &pdev->dev;
235   - struct usbhs_omap_platform_data *pdata = dev->platform_data;
  235 + struct usbhs_omap_platform_data *pdata = dev_get_platdata(dev);
236 236 struct platform_device *ehci;
237 237 struct platform_device *ohci;
238 238 struct resource *res;
... ... @@ -571,7 +571,7 @@
571 571 static int usbhs_omap_probe(struct platform_device *pdev)
572 572 {
573 573 struct device *dev = &pdev->dev;
574   - struct usbhs_omap_platform_data *pdata = dev->platform_data;
  574 + struct usbhs_omap_platform_data *pdata = dev_get_platdata(dev);
575 575 struct usbhs_hcd_omap *omap;
576 576 struct resource *res;
577 577 int ret = 0;
drivers/mfd/pcf50633-core.c
Diff comments   View file @ 334a41c
... ... @@ -195,7 +195,7 @@
195 195 const struct i2c_device_id *ids)
196 196 {
197 197 struct pcf50633 *pcf;
198   - struct pcf50633_platform_data *pdata = client->dev.platform_data;
  198 + struct pcf50633_platform_data *pdata = dev_get_platdata(&client->dev);
199 199 int i, ret;
200 200 int version, variant;
201 201  
drivers/mfd/pm8921-core.c
Diff comments   View file @ 334a41c
... ... @@ -106,7 +106,7 @@
106 106  
107 107 static int pm8921_probe(struct platform_device *pdev)
108 108 {
109   - const struct pm8921_platform_data *pdata = pdev->dev.platform_data;
  109 + const struct pm8921_platform_data *pdata = dev_get_platdata(&pdev->dev);
110 110 struct pm8921 *pmic;
111 111 int rc;
112 112 u8 val;
drivers/mfd/rc5t583.c
Diff comments   View file @ 334a41c
... ... @@ -250,7 +250,7 @@
250 250 const struct i2c_device_id *id)
251 251 {
252 252 struct rc5t583 *rc5t583;
253   - struct rc5t583_platform_data *pdata = i2c->dev.platform_data;
  253 + struct rc5t583_platform_data *pdata = dev_get_platdata(&i2c->dev);
254 254 int ret;
255 255 bool irq_init_success = false;
256 256  
drivers/mfd/sec-core.c
Diff comments   View file @ 334a41c
... ... @@ -216,7 +216,7 @@
216 216 static int sec_pmic_probe(struct i2c_client *i2c,
217 217 const struct i2c_device_id *id)
218 218 {
219   - struct sec_platform_data *pdata = i2c->dev.platform_data;
  219 + struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev);
220 220 const struct regmap_config *regmap;
221 221 struct sec_pmic_dev *sec_pmic;
222 222 int ret;
drivers/mfd/si476x-i2c.c
Diff comments   View file @ 334a41c
... ... @@ -718,7 +718,7 @@
718 718 atomic_set(&core->is_alive, 0);
719 719 core->power_state = SI476X_POWER_DOWN;
720 720  
721   - pdata = client->dev.platform_data;
  721 + pdata = dev_get_platdata(&client->dev);
722 722 if (pdata) {
723 723 memcpy(&core->power_up_parameters,
724 724 &pdata->power_up_parameters,
... ... @@ -840,7 +840,7 @@
840 840 if (!pdev)
841 841 return -ENOMEM;
842 842  
843   - uart_data = pdev->dev.platform_data;
  843 + uart_data = dev_get_platdata(&pdev->dev);
844 844  
845 845 if (devices & SM501_USE_UART0) {
846 846 sm501_setup_uart_data(sm, uart_data++, 0x30000);
... ... @@ -1167,7 +1167,7 @@
1167 1167 if (!pdev)
1168 1168 return -ENOMEM;
1169 1169  
1170   - icd = pdev->dev.platform_data;
  1170 + icd = dev_get_platdata(&pdev->dev);
1171 1171  
1172 1172 /* We keep the pin_sda and pin_scl fields relative in case the
1173 1173 * same platform data is passed to >1 SM501.
... ... @@ -1403,7 +1403,7 @@
1403 1403  
1404 1404 sm->dev = &dev->dev;
1405 1405 sm->pdev_id = dev->id;
1406   - sm->platdata = dev->dev.platform_data;
  1406 + sm->platdata = dev_get_platdata(&dev->dev);
1407 1407  
1408 1408 ret = platform_get_irq(dev, 0);
1409 1409 if (ret < 0) {
drivers/mfd/sta2x11-mfd.c
Diff comments   View file @ 334a41c
... ... @@ -133,7 +133,7 @@
133 133 void __iomem **regs,
134 134 spinlock_t **lock)
135 135 {
136   - struct pci_dev *pdev = *(struct pci_dev **)(dev->dev.platform_data);
  136 + struct pci_dev *pdev = *(struct pci_dev **)dev_get_platdata(&dev->dev);
137 137 struct sta2x11_mfd *mfd;
138 138  
139 139 if (!pdev)
... ... @@ -312,7 +312,7 @@
312 312 const char *name = sta2x11_mfd_names[index];
313 313 struct regmap_config *regmap_config = sta2x11_mfd_regmap_configs[index];
314 314  
315   - pdev = dev->dev.platform_data;
  315 + pdev = dev_get_platdata(&dev->dev);
316 316 mfd = sta2x11_mfd_find(*pdev);
317 317 if (!mfd)
318 318 return -ENODEV;
drivers/mfd/t7l66xb.c
Diff comments   View file @ 334a41c
... ... @@ -281,7 +281,7 @@
281 281 static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state)
282 282 {
283 283 struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
284   - struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
  284 + struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
285 285  
286 286 if (pdata && pdata->suspend)
287 287 pdata->suspend(dev);
... ... @@ -293,7 +293,7 @@
293 293 static int t7l66xb_resume(struct platform_device *dev)
294 294 {
295 295 struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
296   - struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
  296 + struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
297 297  
298 298 clk_enable(t7l66xb->clk48m);
299 299 if (pdata && pdata->resume)
... ... @@ -313,7 +313,7 @@
313 313  
314 314 static int t7l66xb_probe(struct platform_device *dev)
315 315 {
316   - struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
  316 + struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
317 317 struct t7l66xb *t7l66xb;
318 318 struct resource *iomem, *rscr;
319 319 int ret;
... ... @@ -409,7 +409,7 @@
409 409  
410 410 static int t7l66xb_remove(struct platform_device *dev)
411 411 {
412   - struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
  412 + struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
413 413 struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
414 414 int ret;
415 415  
drivers/mfd/tc3589x.c
Diff comments   View file @ 334a41c
... ... @@ -325,7 +325,7 @@
325 325 static int tc3589x_probe(struct i2c_client *i2c,
326 326 const struct i2c_device_id *id)
327 327 {
328   - struct tc3589x_platform_data *pdata = i2c->dev.platform_data;
  328 + struct tc3589x_platform_data *pdata = dev_get_platdata(&i2c->dev);
329 329 struct device_node *np = i2c->dev.of_node;
330 330 struct tc3589x *tc3589x;
331 331 int ret;
drivers/mfd/tc6387xb.c
Diff comments   View file @ 334a41c
... ... @@ -48,7 +48,7 @@
48 48 static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state)
49 49 {
50 50 struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
51   - struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
  51 + struct tc6387xb_platform_data *pdata = dev_get_platdata(&dev->dev);
52 52  
53 53 if (pdata && pdata->suspend)
54 54 pdata->suspend(dev);
... ... @@ -60,7 +60,7 @@
60 60 static int tc6387xb_resume(struct platform_device *dev)
61 61 {
62 62 struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
63   - struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
  63 + struct tc6387xb_platform_data *pdata = dev_get_platdata(&dev->dev);
64 64  
65 65 clk_enable(tc6387xb->clk32k);
66 66 if (pdata && pdata->resume)
... ... @@ -140,7 +140,7 @@
140 140  
141 141 static int tc6387xb_probe(struct platform_device *dev)
142 142 {
143   - struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
  143 + struct tc6387xb_platform_data *pdata = dev_get_platdata(&dev->dev);
144 144 struct resource *iomem, *rscr;
145 145 struct clk *clk32k;
146 146 struct tc6387xb *tc6387xb;
drivers/mfd/tc6393xb.c
Diff comments   View file @ 334a41c
... ... @@ -604,7 +604,7 @@
604 604  
605 605 static int tc6393xb_probe(struct platform_device *dev)
606 606 {
607   - struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
  607 + struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
608 608 struct tc6393xb *tc6393xb;
609 609 struct resource *iomem, *rscr;
610 610 int ret, temp;
... ... @@ -733,7 +733,7 @@
733 733  
734 734 static int tc6393xb_remove(struct platform_device *dev)
735 735 {
736   - struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
  736 + struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
737 737 struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
738 738 int ret;
739 739  
... ... @@ -765,7 +765,7 @@
765 765 #ifdef CONFIG_PM
766 766 static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)
767 767 {
768   - struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
  768 + struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
769 769 struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
770 770 int i, ret;
771 771  
... ... @@ -788,7 +788,7 @@
788 788  
789 789 static int tc6393xb_resume(struct platform_device *dev)
790 790 {
791   - struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
  791 + struct tc6393xb_platform_data *tcpd = dev_get_platdata(&dev->dev);
792 792 struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
793 793 int ret;
794 794 int i;
drivers/mfd/ti-ssp.c
Diff comments   View file @ 334a41c
... ... @@ -318,7 +318,7 @@
318 318 static int ti_ssp_probe(struct platform_device *pdev)
319 319 {
320 320 static struct ti_ssp *ssp;
321   - const struct ti_ssp_data *pdata = pdev->dev.platform_data;
  321 + const struct ti_ssp_data *pdata = dev_get_platdata(&pdev->dev);
322 322 int error = 0, prediv = 0xff, id;
323 323 unsigned long sysclk;
324 324 struct device *dev = &pdev->dev;
drivers/mfd/tps6105x.c
Diff comments   View file @ 334a41c
... ... @@ -147,7 +147,7 @@
147 147  
148 148 i2c_set_clientdata(client, tps6105x);
149 149 tps6105x->client = client;
150   - pdata = client->dev.platform_data;
  150 + pdata = dev_get_platdata(&client->dev);
151 151 tps6105x->pdata = pdata;
152 152 mutex_init(&tps6105x->lock);
153 153  
drivers/mfd/tps65010.c
Diff comments   View file @ 334a41c
... ... @@ -517,7 +517,7 @@
517 517 static int __exit tps65010_remove(struct i2c_client *client)
518 518 {
519 519 struct tps65010 *tps = i2c_get_clientdata(client);
520   - struct tps65010_board *board = client->dev.platform_data;
  520 + struct tps65010_board *board = dev_get_platdata(&client->dev);
521 521  
522 522 if (board && board->teardown) {
523 523 int status = board->teardown(client, board->context);
... ... @@ -539,7 +539,7 @@
539 539 {
540 540 struct tps65010 *tps;
541 541 int status;
542   - struct tps65010_board *board = client->dev.platform_data;
  542 + struct tps65010_board *board = dev_get_platdata(&client->dev);
543 543  
544 544 if (the_tps) {
545 545 dev_dbg(&client->dev, "only one tps6501x chip allowed\n");
drivers/mfd/tps65090.c
Diff comments   View file @ 334a41c
... ... @@ -172,7 +172,7 @@
172 172 static int tps65090_i2c_probe(struct i2c_client *client,
173 173 const struct i2c_device_id *id)
174 174 {
175   - struct tps65090_platform_data *pdata = client->dev.platform_data;
  175 + struct tps65090_platform_data *pdata = dev_get_platdata(&client->dev);
176 176 int irq_base = 0;
177 177 struct tps65090 *tps65090;
178 178 int ret;
drivers/mfd/tps6586x.c
Diff comments   View file @ 334a41c
... ... @@ -462,7 +462,7 @@
462 462 static int tps6586x_i2c_probe(struct i2c_client *client,
463 463 const struct i2c_device_id *id)
464 464 {
465   - struct tps6586x_platform_data *pdata = client->dev.platform_data;
  465 + struct tps6586x_platform_data *pdata = dev_get_platdata(&client->dev);
466 466 struct tps6586x *tps6586x;
467 467 int ret;
468 468  
drivers/mfd/tps65912-core.c
Diff comments   View file @ 334a41c
... ... @@ -123,7 +123,7 @@
123 123  
124 124 int tps65912_device_init(struct tps65912 *tps65912)
125 125 {
126   - struct tps65912_board *pmic_plat_data = tps65912->dev->platform_data;
  126 + struct tps65912_board *pmic_plat_data = dev_get_platdata(tps65912->dev);
127 127 struct tps65912_platform_data *init_data;
128 128 int ret, dcdc_avs, value;
129 129  
drivers/mfd/tps80031.c
Diff comments   View file @ 334a41c
... ... @@ -418,7 +418,7 @@
418 418 static int tps80031_probe(struct i2c_client *client,
419 419 const struct i2c_device_id *id)
420 420 {
421   - struct tps80031_platform_data *pdata = client->dev.platform_data;
  421 + struct tps80031_platform_data *pdata = dev_get_platdata(&client->dev);
422 422 struct tps80031 *tps80031;
423 423 int ret;
424 424 uint8_t es_version;
drivers/mfd/twl-core.c
Diff comments   View file @ 334a41c
... ... @@ -1137,7 +1137,7 @@
1137 1137 static int
1138 1138 twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
1139 1139 {
1140   - struct twl4030_platform_data *pdata = client->dev.platform_data;
  1140 + struct twl4030_platform_data *pdata = dev_get_platdata(&client->dev);
1141 1141 struct device_node *node = client->dev.of_node;
1142 1142 struct platform_device *pdev;
1143 1143 struct regmap_config *twl_regmap_config;
drivers/mfd/twl4030-audio.c
Diff comments   View file @ 334a41c
... ... @@ -187,7 +187,7 @@
187 187 static int twl4030_audio_probe(struct platform_device *pdev)
188 188 {
189 189 struct twl4030_audio *audio;
190   - struct twl4030_audio_data *pdata = pdev->dev.platform_data;
  190 + struct twl4030_audio_data *pdata = dev_get_platdata(&pdev->dev);
191 191 struct device_node *node = pdev->dev.of_node;
192 192 struct mfd_cell *cell = NULL;
193 193 int ret, childs = 0;
drivers/mfd/twl4030-madc.c
Diff comments   View file @ 334a41c
... ... @@ -701,7 +701,7 @@
701 701 static int twl4030_madc_probe(struct platform_device *pdev)
702 702 {
703 703 struct twl4030_madc_data *madc;
704   - struct twl4030_madc_platform_data *pdata = pdev->dev.platform_data;
  704 + struct twl4030_madc_platform_data *pdata = dev_get_platdata(&pdev->dev);
705 705 int ret;
706 706 u8 regval;
707 707  
drivers/mfd/twl4030-power.c
Diff comments   View file @ 334a41c
... ... @@ -555,7 +555,7 @@
555 555  
556 556 int twl4030_power_probe(struct platform_device *pdev)
557 557 {
558   - struct twl4030_power_data *pdata = pdev->dev.platform_data;
  558 + struct twl4030_power_data *pdata = dev_get_platdata(&pdev->dev);
559 559 struct device_node *node = pdev->dev.of_node;
560 560 int err = 0;
561 561 int err2 = 0;
drivers/mfd/ucb1400_core.c
Diff comments   View file @ 334a41c
... ... @@ -52,7 +52,7 @@
52 52 struct ucb1400_ts ucb_ts;
53 53 struct ucb1400_gpio ucb_gpio;
54 54 struct snd_ac97 *ac97;
55   - struct ucb1400_pdata *pdata = dev->platform_data;
  55 + struct ucb1400_pdata *pdata = dev_get_platdata(dev);
56 56  
57 57 memset(&ucb_ts, 0, sizeof(ucb_ts));
58 58 memset(&ucb_gpio, 0, sizeof(ucb_gpio));
drivers/mfd/ucb1x00-core.c
Diff comments   View file @ 334a41c
... ... @@ -671,7 +671,7 @@
671 671  
672 672 static int ucb1x00_suspend(struct device *dev)
673 673 {
674   - struct ucb1x00_plat_data *pdata = dev->platform_data;
  674 + struct ucb1x00_plat_data *pdata = dev_get_platdata(dev);
675 675 struct ucb1x00 *ucb = dev_get_drvdata(dev);
676 676 struct ucb1x00_dev *udev;
677 677  
... ... @@ -703,7 +703,7 @@
703 703  
704 704 static int ucb1x00_resume(struct device *dev)
705 705 {
706   - struct ucb1x00_plat_data *pdata = dev->platform_data;
  706 + struct ucb1x00_plat_data *pdata = dev_get_platdata(dev);
707 707 struct ucb1x00 *ucb = dev_get_drvdata(dev);
708 708 struct ucb1x00_dev *udev;
709 709  
drivers/mfd/wl1273-core.c
Diff comments   View file @ 334a41c
... ... @@ -185,7 +185,7 @@
185 185 static int wl1273_core_probe(struct i2c_client *client,
186 186 const struct i2c_device_id *id)
187 187 {
188   - struct wl1273_fm_platform_data *pdata = client->dev.platform_data;
  188 + struct wl1273_fm_platform_data *pdata = dev_get_platdata(&client->dev);
189 189 struct wl1273_core *core;
190 190 struct mfd_cell *cell;
191 191 int children = 0;
drivers/mfd/wm831x-core.c
Diff comments   View file @ 334a41c
... ... @@ -1618,7 +1618,7 @@
1618 1618 */
1619 1619 int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
1620 1620 {
1621   - struct wm831x_pdata *pdata = wm831x->dev->platform_data;
  1621 + struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
1622 1622 int rev, wm831x_num;
1623 1623 enum wm831x_parent parent;
1624 1624 int ret, i;
drivers/mfd/wm831x-irq.c
Diff comments   View file @ 334a41c
... ... @@ -571,7 +571,7 @@
571 571  
572 572 int wm831x_irq_init(struct wm831x *wm831x, int irq)
573 573 {
574   - struct wm831x_pdata *pdata = wm831x->dev->platform_data;
  574 + struct wm831x_pdata *pdata = dev_get_platdata(wm831x->dev);
575 575 struct irq_domain *domain;
576 576 int i, ret, irq_base;
577 577  
drivers/mfd/wm8350-i2c.c
Diff comments   View file @ 334a41c
... ... @@ -27,6 +27,7 @@
27 27 const struct i2c_device_id *id)
28 28 {
29 29 struct wm8350 *wm8350;
  30 + struct wm8350_platform_data *pdata = dev_get_platdata(&i2c->dev);
30 31 int ret = 0;
31 32  
32 33 wm8350 = devm_kzalloc(&i2c->dev, sizeof(struct wm8350), GFP_KERNEL);
... ... @@ -44,7 +45,7 @@
44 45 i2c_set_clientdata(i2c, wm8350);
45 46 wm8350->dev = &i2c->dev;
46 47  
47   - return wm8350_device_init(wm8350, i2c->irq, i2c->dev.platform_data);
  48 + return wm8350_device_init(wm8350, i2c->irq, pdata);
48 49 }
49 50  
50 51 static int wm8350_i2c_remove(struct i2c_client *i2c)
drivers/mfd/wm8400-core.c
Diff comments   View file @ 334a41c
... ... @@ -178,7 +178,7 @@
178 178 wm8400->dev = &i2c->dev;
179 179 i2c_set_clientdata(i2c, wm8400);
180 180  
181   - ret = wm8400_init(wm8400, i2c->dev.platform_data);
  181 + ret = wm8400_init(wm8400, dev_get_platdata(&i2c->dev));
182 182 if (ret != 0)
183 183 goto err;
184 184  
drivers/mfd/wm8994-irq.c
Diff comments   View file @ 334a41c
... ... @@ -193,7 +193,7 @@
193 193 {
194 194 int ret;
195 195 unsigned long irqflags;
196   - struct wm8994_pdata *pdata = wm8994->dev->platform_data;
  196 + struct wm8994_pdata *pdata = dev_get_platdata(wm8994->dev);
197 197  
198 198 if (!wm8994->irq) {
199 199 dev_warn(wm8994->dev,