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

Input: use dev_get_platdata()

Use the wrapper function for retrieving the platform data instead
of accessing dev->platform_data directly. This is a cosmetic change
to make the code simpler and enhance the readability.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Jingoo Han and committed by
Dmitry Torokhov
c838cb3d 54f05e95

+79 -67
+1 -1
drivers/input/keyboard/adp5520-keys.c
··· 71 71 72 72 static int adp5520_keys_probe(struct platform_device *pdev) 73 73 { 74 - struct adp5520_keys_platform_data *pdata = pdev->dev.platform_data; 74 + struct adp5520_keys_platform_data *pdata = dev_get_platdata(&pdev->dev); 75 75 struct input_dev *input; 76 76 struct adp5520_keys *dev; 77 77 int ret, i;
+6 -4
drivers/input/keyboard/adp5588-keys.c
··· 173 173 static int adp5588_gpio_add(struct adp5588_kpad *kpad) 174 174 { 175 175 struct device *dev = &kpad->client->dev; 176 - const struct adp5588_kpad_platform_data *pdata = dev->platform_data; 176 + const struct adp5588_kpad_platform_data *pdata = dev_get_platdata(dev); 177 177 const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data; 178 178 int i, error; 179 179 ··· 227 227 static void adp5588_gpio_remove(struct adp5588_kpad *kpad) 228 228 { 229 229 struct device *dev = &kpad->client->dev; 230 - const struct adp5588_kpad_platform_data *pdata = dev->platform_data; 230 + const struct adp5588_kpad_platform_data *pdata = dev_get_platdata(dev); 231 231 const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data; 232 232 int error; 233 233 ··· 321 321 322 322 static int adp5588_setup(struct i2c_client *client) 323 323 { 324 - const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data; 324 + const struct adp5588_kpad_platform_data *pdata = 325 + dev_get_platdata(&client->dev); 325 326 const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data; 326 327 int i, ret; 327 328 unsigned char evt_mode1 = 0, evt_mode2 = 0, evt_mode3 = 0; ··· 425 424 const struct i2c_device_id *id) 426 425 { 427 426 struct adp5588_kpad *kpad; 428 - const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data; 427 + const struct adp5588_kpad_platform_data *pdata = 428 + dev_get_platdata(&client->dev); 429 429 struct input_dev *input; 430 430 unsigned int revid; 431 431 int ret, i;
+4 -4
drivers/input/keyboard/adp5589-keys.c
··· 499 499 static int adp5589_gpio_add(struct adp5589_kpad *kpad) 500 500 { 501 501 struct device *dev = &kpad->client->dev; 502 - const struct adp5589_kpad_platform_data *pdata = dev->platform_data; 502 + const struct adp5589_kpad_platform_data *pdata = dev_get_platdata(dev); 503 503 const struct adp5589_gpio_platform_data *gpio_data = pdata->gpio_data; 504 504 int i, error; 505 505 ··· 553 553 static void adp5589_gpio_remove(struct adp5589_kpad *kpad) 554 554 { 555 555 struct device *dev = &kpad->client->dev; 556 - const struct adp5589_kpad_platform_data *pdata = dev->platform_data; 556 + const struct adp5589_kpad_platform_data *pdata = dev_get_platdata(dev); 557 557 const struct adp5589_gpio_platform_data *gpio_data = pdata->gpio_data; 558 558 int error; 559 559 ··· 658 658 { 659 659 struct i2c_client *client = kpad->client; 660 660 const struct adp5589_kpad_platform_data *pdata = 661 - client->dev.platform_data; 661 + dev_get_platdata(&client->dev); 662 662 u8 (*reg) (u8) = kpad->var->reg; 663 663 unsigned char evt_mode1 = 0, evt_mode2 = 0, evt_mode3 = 0; 664 664 unsigned char pull_mask = 0; ··· 864 864 { 865 865 struct adp5589_kpad *kpad; 866 866 const struct adp5589_kpad_platform_data *pdata = 867 - client->dev.platform_data; 867 + dev_get_platdata(&client->dev); 868 868 struct input_dev *input; 869 869 unsigned int revid; 870 870 int ret, i;
+2 -2
drivers/input/keyboard/bf54x-keys.c
··· 180 180 static int bfin_kpad_probe(struct platform_device *pdev) 181 181 { 182 182 struct bf54x_kpad *bf54x_kpad; 183 - struct bfin_kpad_platform_data *pdata = pdev->dev.platform_data; 183 + struct bfin_kpad_platform_data *pdata = dev_get_platdata(&pdev->dev); 184 184 struct input_dev *input; 185 185 int i, error; 186 186 ··· 332 332 333 333 static int bfin_kpad_remove(struct platform_device *pdev) 334 334 { 335 - struct bfin_kpad_platform_data *pdata = pdev->dev.platform_data; 335 + struct bfin_kpad_platform_data *pdata = dev_get_platdata(&pdev->dev); 336 336 struct bf54x_kpad *bf54x_kpad = platform_get_drvdata(pdev); 337 337 338 338 del_timer_sync(&bf54x_kpad->timer);
+1 -1
drivers/input/keyboard/davinci_keyscan.c
··· 172 172 struct input_dev *key_dev; 173 173 struct resource *res, *mem; 174 174 struct device *dev = &pdev->dev; 175 - struct davinci_ks_platform_data *pdata = pdev->dev.platform_data; 175 + struct davinci_ks_platform_data *pdata = dev_get_platdata(&pdev->dev); 176 176 int error, i; 177 177 178 178 if (pdata->device_enable) {
+1 -1
drivers/input/keyboard/ep93xx_keypad.c
··· 244 244 if (!keypad) 245 245 return -ENOMEM; 246 246 247 - keypad->pdata = pdev->dev.platform_data; 247 + keypad->pdata = dev_get_platdata(&pdev->dev); 248 248 if (!keypad->pdata) { 249 249 err = -EINVAL; 250 250 goto failed_free;
+2 -1
drivers/input/keyboard/imx_keypad.c
··· 425 425 426 426 static int imx_keypad_probe(struct platform_device *pdev) 427 427 { 428 - const struct matrix_keymap_data *keymap_data = pdev->dev.platform_data; 428 + const struct matrix_keymap_data *keymap_data = 429 + dev_get_platdata(&pdev->dev); 429 430 struct imx_keypad *keypad; 430 431 struct input_dev *input_dev; 431 432 struct resource *res;
+1 -1
drivers/input/keyboard/lm8323.c
··· 627 627 static int lm8323_probe(struct i2c_client *client, 628 628 const struct i2c_device_id *id) 629 629 { 630 - struct lm8323_platform_data *pdata = client->dev.platform_data; 630 + struct lm8323_platform_data *pdata = dev_get_platdata(&client->dev); 631 631 struct input_dev *idev; 632 632 struct lm8323_chip *lm; 633 633 int pwm;
+2 -1
drivers/input/keyboard/lm8333.c
··· 131 131 static int lm8333_probe(struct i2c_client *client, 132 132 const struct i2c_device_id *id) 133 133 { 134 - const struct lm8333_platform_data *pdata = client->dev.platform_data; 134 + const struct lm8333_platform_data *pdata = 135 + dev_get_platdata(&client->dev); 135 136 struct lm8333 *lm8333; 136 137 struct input_dev *input; 137 138 int err, active_time;
+2 -1
drivers/input/keyboard/max7359_keypad.c
··· 182 182 static int max7359_probe(struct i2c_client *client, 183 183 const struct i2c_device_id *id) 184 184 { 185 - const struct matrix_keymap_data *keymap_data = client->dev.platform_data; 185 + const struct matrix_keymap_data *keymap_data = 186 + dev_get_platdata(&client->dev); 186 187 struct max7359_keypad *keypad; 187 188 struct input_dev *input_dev; 188 189 int ret;
+1 -1
drivers/input/keyboard/mcs_touchkey.c
··· 108 108 int error; 109 109 int i; 110 110 111 - pdata = client->dev.platform_data; 111 + pdata = dev_get_platdata(&client->dev); 112 112 if (!pdata) { 113 113 dev_err(&client->dev, "no platform data defined\n"); 114 114 return -EINVAL;
+2 -1
drivers/input/keyboard/mpr121_touchkey.c
··· 188 188 static int mpr_touchkey_probe(struct i2c_client *client, 189 189 const struct i2c_device_id *id) 190 190 { 191 - const struct mpr121_platform_data *pdata = client->dev.platform_data; 191 + const struct mpr121_platform_data *pdata = 192 + dev_get_platdata(&client->dev); 192 193 struct mpr121_touchkey *mpr121; 193 194 struct input_dev *input_dev; 194 195 int error;
+2 -1
drivers/input/keyboard/nomadik-ske-keypad.c
··· 222 222 223 223 static int __init ske_keypad_probe(struct platform_device *pdev) 224 224 { 225 - const struct ske_keypad_platform_data *plat = pdev->dev.platform_data; 225 + const struct ske_keypad_platform_data *plat = 226 + dev_get_platdata(&pdev->dev); 226 227 struct ske_keypad *keypad; 227 228 struct input_dev *input; 228 229 struct resource *res;
+1 -1
drivers/input/keyboard/omap-keypad.c
··· 248 248 { 249 249 struct omap_kp *omap_kp; 250 250 struct input_dev *input_dev; 251 - struct omap_kp_platform_data *pdata = pdev->dev.platform_data; 251 + struct omap_kp_platform_data *pdata = dev_get_platdata(&pdev->dev); 252 252 int i, col_idx, row_idx, ret; 253 253 unsigned int row_shift, keycodemax; 254 254
+2 -1
drivers/input/keyboard/pxa930_rotary.c
··· 84 84 85 85 static int pxa930_rotary_probe(struct platform_device *pdev) 86 86 { 87 - struct pxa930_rotary_platform_data *pdata = pdev->dev.platform_data; 87 + struct pxa930_rotary_platform_data *pdata = 88 + dev_get_platdata(&pdev->dev); 88 89 struct pxa930_rotary *r; 89 90 struct input_dev *input_dev; 90 91 struct resource *res;
+1 -1
drivers/input/keyboard/samsung-keypad.c
··· 321 321 if (pdev->dev.of_node) 322 322 pdata = samsung_keypad_parse_dt(&pdev->dev); 323 323 else 324 - pdata = pdev->dev.platform_data; 324 + pdata = dev_get_platdata(&pdev->dev); 325 325 if (!pdata) { 326 326 dev_err(&pdev->dev, "no platform data defined\n"); 327 327 return -EINVAL;
+2 -2
drivers/input/keyboard/sh_keysc.c
··· 171 171 int i; 172 172 int irq, error; 173 173 174 - if (!pdev->dev.platform_data) { 174 + if (!dev_get_platdata(&pdev->dev)) { 175 175 dev_err(&pdev->dev, "no platform data defined\n"); 176 176 error = -EINVAL; 177 177 goto err0; ··· 198 198 } 199 199 200 200 platform_set_drvdata(pdev, priv); 201 - memcpy(&priv->pdata, pdev->dev.platform_data, sizeof(priv->pdata)); 201 + memcpy(&priv->pdata, dev_get_platdata(&pdev->dev), sizeof(priv->pdata)); 202 202 pdata = &priv->pdata; 203 203 204 204 priv->iomem_base = ioremap_nocache(res->start, resource_size(res));
+1 -1
drivers/input/keyboard/tca6416-keypad.c
··· 213 213 return -ENODEV; 214 214 } 215 215 216 - pdata = client->dev.platform_data; 216 + pdata = dev_get_platdata(&client->dev); 217 217 if (!pdata) { 218 218 dev_dbg(&client->dev, "no platform data\n"); 219 219 return -EINVAL;
+1 -1
drivers/input/keyboard/tnetv107x-keypad.c
··· 162 162 int error = 0, sz, row_shift; 163 163 u32 rev = 0; 164 164 165 - pdata = pdev->dev.platform_data; 165 + pdata = dev_get_platdata(&pdev->dev); 166 166 if (!pdata) { 167 167 dev_err(dev, "cannot find device data\n"); 168 168 return -EINVAL;
+1 -1
drivers/input/keyboard/twl4030_keypad.c
··· 330 330 */ 331 331 static int twl4030_kp_probe(struct platform_device *pdev) 332 332 { 333 - struct twl4030_keypad_data *pdata = pdev->dev.platform_data; 333 + struct twl4030_keypad_data *pdata = dev_get_platdata(&pdev->dev); 334 334 const struct matrix_keymap_data *keymap_data; 335 335 struct twl4030_keypad *kp; 336 336 struct input_dev *input;
+1 -1
drivers/input/keyboard/w90p910_keypad.c
··· 121 121 static int w90p910_keypad_probe(struct platform_device *pdev) 122 122 { 123 123 const struct w90p910_keypad_platform_data *pdata = 124 - pdev->dev.platform_data; 124 + dev_get_platdata(&pdev->dev); 125 125 const struct matrix_keymap_data *keymap_data; 126 126 struct w90p910_keypad *keypad; 127 127 struct input_dev *input_dev;
+2 -2
drivers/input/misc/ad714x.c
··· 969 969 int error; 970 970 struct input_dev *input[MAX_DEVICE_NUM]; 971 971 972 - struct ad714x_platform_data *plat_data = dev->platform_data; 972 + struct ad714x_platform_data *plat_data = dev_get_platdata(dev); 973 973 struct ad714x_chip *ad714x; 974 974 void *drv_mem; 975 975 unsigned long irqflags; ··· 986 986 goto err_out; 987 987 } 988 988 989 - if (dev->platform_data == NULL) { 989 + if (dev_get_platdata(dev) == NULL) { 990 990 dev_err(dev, "platform data for ad714x doesn't exist\n"); 991 991 error = -EINVAL; 992 992 goto err_out;
+1 -1
drivers/input/misc/adxl34x.c
··· 714 714 715 715 ac->fifo_delay = fifo_delay_default; 716 716 717 - pdata = dev->platform_data; 717 + pdata = dev_get_platdata(dev); 718 718 if (!pdata) { 719 719 dev_dbg(dev, 720 720 "No platform data: Using default initialization\n");
+1 -1
drivers/input/misc/bfin_rotary.c
··· 92 92 93 93 static int bfin_rotary_probe(struct platform_device *pdev) 94 94 { 95 - struct bfin_rotary_platform_data *pdata = pdev->dev.platform_data; 95 + struct bfin_rotary_platform_data *pdata = dev_get_platdata(&pdev->dev); 96 96 struct bfin_rot *rotary; 97 97 struct input_dev *input; 98 98 int error;
+2 -1
drivers/input/misc/bma150.c
··· 526 526 static int bma150_probe(struct i2c_client *client, 527 527 const struct i2c_device_id *id) 528 528 { 529 - const struct bma150_platform_data *pdata = client->dev.platform_data; 529 + const struct bma150_platform_data *pdata = 530 + dev_get_platdata(&client->dev); 530 531 const struct bma150_cfg *cfg; 531 532 struct bma150_data *bma150; 532 533 int chip_id;
+1 -1
drivers/input/misc/cma3000_d0x.c
··· 284 284 struct cma3000_accl_data *cma3000_init(struct device *dev, int irq, 285 285 const struct cma3000_bus_ops *bops) 286 286 { 287 - const struct cma3000_platform_data *pdata = dev->platform_data; 287 + const struct cma3000_platform_data *pdata = dev_get_platdata(dev); 288 288 struct cma3000_accl_data *data; 289 289 struct input_dev *input_dev; 290 290 int rev;
+1 -1
drivers/input/misc/gp2ap002a00f.c
··· 125 125 static int gp2a_probe(struct i2c_client *client, 126 126 const struct i2c_device_id *id) 127 127 { 128 - const struct gp2a_platform_data *pdata = client->dev.platform_data; 128 + const struct gp2a_platform_data *pdata = dev_get_platdata(&client->dev); 129 129 struct gp2a_data *dt; 130 130 int error; 131 131
+2 -1
drivers/input/misc/gpio_tilt_polled.c
··· 98 98 99 99 static int gpio_tilt_polled_probe(struct platform_device *pdev) 100 100 { 101 - const struct gpio_tilt_platform_data *pdata = pdev->dev.platform_data; 101 + const struct gpio_tilt_platform_data *pdata = 102 + dev_get_platdata(&pdev->dev); 102 103 struct device *dev = &pdev->dev; 103 104 struct gpio_tilt_polled_dev *tdev; 104 105 struct input_polled_dev *poll_dev;
+2 -1
drivers/input/misc/kxtj9.c
··· 509 509 static int kxtj9_probe(struct i2c_client *client, 510 510 const struct i2c_device_id *id) 511 511 { 512 - const struct kxtj9_platform_data *pdata = client->dev.platform_data; 512 + const struct kxtj9_platform_data *pdata = 513 + dev_get_platdata(&client->dev); 513 514 struct kxtj9_data *tj9; 514 515 int err; 515 516
+1 -1
drivers/input/misc/pwm-beeper.c
··· 68 68 69 69 static int pwm_beeper_probe(struct platform_device *pdev) 70 70 { 71 - unsigned long pwm_id = (unsigned long)pdev->dev.platform_data; 71 + unsigned long pwm_id = (unsigned long)dev_get_platdata(&pdev->dev); 72 72 struct pwm_beeper *beeper; 73 73 int error; 74 74
+1 -1
drivers/input/misc/twl4030-vibra.c
··· 193 193 194 194 static int twl4030_vibra_probe(struct platform_device *pdev) 195 195 { 196 - struct twl4030_vibra_data *pdata = pdev->dev.platform_data; 196 + struct twl4030_vibra_data *pdata = dev_get_platdata(&pdev->dev); 197 197 struct device_node *twl4030_core_node = pdev->dev.parent->of_node; 198 198 struct vibra_info *info; 199 199 int ret;
+1 -1
drivers/input/mouse/gpio_mouse.c
··· 48 48 49 49 static int gpio_mouse_probe(struct platform_device *pdev) 50 50 { 51 - struct gpio_mouse_platform_data *pdata = pdev->dev.platform_data; 51 + struct gpio_mouse_platform_data *pdata = dev_get_platdata(&pdev->dev); 52 52 struct input_polled_dev *input_poll; 53 53 struct input_dev *input; 54 54 int pin, i;
+1 -1
drivers/input/mouse/pxa930_trkball.c
··· 166 166 if (!trkball) 167 167 return -ENOMEM; 168 168 169 - trkball->pdata = pdev->dev.platform_data; 169 + trkball->pdata = dev_get_platdata(&pdev->dev); 170 170 if (!trkball->pdata) { 171 171 dev_err(&pdev->dev, "no platform data defined\n"); 172 172 error = -EINVAL;
+1 -1
drivers/input/touchscreen/88pm860x-ts.c
··· 172 172 static int pm860x_touch_probe(struct platform_device *pdev) 173 173 { 174 174 struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent); 175 - struct pm860x_touch_pdata *pdata = pdev->dev.platform_data; 175 + struct pm860x_touch_pdata *pdata = dev_get_platdata(&pdev->dev); 176 176 struct pm860x_touch *touch; 177 177 struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \ 178 178 : chip->companion;
+1 -1
drivers/input/touchscreen/ad7877.c
··· 686 686 { 687 687 struct ad7877 *ts; 688 688 struct input_dev *input_dev; 689 - struct ad7877_platform_data *pdata = spi->dev.platform_data; 689 + struct ad7877_platform_data *pdata = dev_get_platdata(&spi->dev); 690 690 int err; 691 691 u16 verify; 692 692
+2 -2
drivers/input/touchscreen/ad7879.c
··· 470 470 471 471 static void ad7879_gpio_remove(struct ad7879 *ts) 472 472 { 473 - const struct ad7879_platform_data *pdata = ts->dev->platform_data; 473 + const struct ad7879_platform_data *pdata = dev_get_platdata(ts->dev); 474 474 int ret; 475 475 476 476 if (pdata->gpio_export) { ··· 495 495 struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq, 496 496 const struct ad7879_bus_ops *bops) 497 497 { 498 - struct ad7879_platform_data *pdata = dev->platform_data; 498 + struct ad7879_platform_data *pdata = dev_get_platdata(dev); 499 499 struct ad7879 *ts; 500 500 struct input_dev *input_dev; 501 501 int err;
+1 -1
drivers/input/touchscreen/atmel_mxt_ts.c
··· 1130 1130 static int mxt_probe(struct i2c_client *client, 1131 1131 const struct i2c_device_id *id) 1132 1132 { 1133 - const struct mxt_platform_data *pdata = client->dev.platform_data; 1133 + const struct mxt_platform_data *pdata = dev_get_platdata(&client->dev); 1134 1134 struct mxt_data *data; 1135 1135 struct input_dev *input_dev; 1136 1136 int error;
+1 -1
drivers/input/touchscreen/atmel_tsadcc.c
··· 182 182 struct atmel_tsadcc *ts_dev; 183 183 struct input_dev *input_dev; 184 184 struct resource *res; 185 - struct at91_tsadcc_data *pdata = pdev->dev.platform_data; 185 + struct at91_tsadcc_data *pdata = dev_get_platdata(&pdev->dev); 186 186 int err; 187 187 unsigned int prsc; 188 188 unsigned int reg;
+1 -1
drivers/input/touchscreen/cy8ctmg110_ts.c
··· 178 178 static int cy8ctmg110_probe(struct i2c_client *client, 179 179 const struct i2c_device_id *id) 180 180 { 181 - const struct cy8ctmg110_pdata *pdata = client->dev.platform_data; 181 + const struct cy8ctmg110_pdata *pdata = dev_get_platdata(&client->dev); 182 182 struct cy8ctmg110 *ts; 183 183 struct input_dev *input_dev; 184 184 int err;
+2 -2
drivers/input/touchscreen/cyttsp_core.c
··· 534 534 struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops, 535 535 struct device *dev, int irq, size_t xfer_buf_size) 536 536 { 537 - const struct cyttsp_platform_data *pdata = dev->platform_data; 537 + const struct cyttsp_platform_data *pdata = dev_get_platdata(dev); 538 538 struct cyttsp *ts; 539 539 struct input_dev *input_dev; 540 540 int error; ··· 553 553 554 554 ts->dev = dev; 555 555 ts->input = input_dev; 556 - ts->pdata = dev->platform_data; 556 + ts->pdata = dev_get_platdata(dev); 557 557 ts->bus_ops = bus_ops; 558 558 ts->irq = irq; 559 559
+1 -1
drivers/input/touchscreen/da9034-ts.c
··· 299 299 300 300 static int da9034_touch_probe(struct platform_device *pdev) 301 301 { 302 - struct da9034_touch_pdata *pdata = pdev->dev.platform_data; 302 + struct da9034_touch_pdata *pdata = dev_get_platdata(&pdev->dev); 303 303 struct da9034_touch *touch; 304 304 struct input_dev *input_dev; 305 305 int ret;
+1 -1
drivers/input/touchscreen/edt-ft5x06.c
··· 705 705 const struct i2c_device_id *id) 706 706 { 707 707 const struct edt_ft5x06_platform_data *pdata = 708 - client->dev.platform_data; 708 + dev_get_platdata(&client->dev); 709 709 struct edt_ft5x06_ts_data *tsdata; 710 710 struct input_dev *input; 711 711 int error;
+1 -1
drivers/input/touchscreen/eeti_ts.c
··· 157 157 static int eeti_ts_probe(struct i2c_client *client, 158 158 const struct i2c_device_id *idp) 159 159 { 160 - struct eeti_ts_platform_data *pdata = client->dev.platform_data; 160 + struct eeti_ts_platform_data *pdata = dev_get_platdata(&client->dev); 161 161 struct eeti_ts_priv *priv; 162 162 struct input_dev *input; 163 163 unsigned int irq_flags;
+1 -1
drivers/input/touchscreen/ili210x.c
··· 184 184 const struct i2c_device_id *id) 185 185 { 186 186 struct device *dev = &client->dev; 187 - const struct ili210x_platform_data *pdata = dev->platform_data; 187 + const struct ili210x_platform_data *pdata = dev_get_platdata(dev); 188 188 struct ili210x *priv; 189 189 struct input_dev *input; 190 190 struct panel_info panel;
+2 -2
drivers/input/touchscreen/mcs5000_ts.c
··· 194 194 struct input_dev *input_dev; 195 195 int ret; 196 196 197 - if (!client->dev.platform_data) 197 + if (!dev_get_platdata(&client->dev)) 198 198 return -EINVAL; 199 199 200 200 data = kzalloc(sizeof(struct mcs5000_ts_data), GFP_KERNEL); ··· 207 207 208 208 data->client = client; 209 209 data->input_dev = input_dev; 210 - data->platform_data = client->dev.platform_data; 210 + data->platform_data = dev_get_platdata(&client->dev); 211 211 212 212 input_dev->name = "MELPAS MCS-5000 Touchscreen"; 213 213 input_dev->id.bustype = BUS_I2C;
+2 -1
drivers/input/touchscreen/pixcir_i2c_ts.c
··· 128 128 static int pixcir_i2c_ts_probe(struct i2c_client *client, 129 129 const struct i2c_device_id *id) 130 130 { 131 - const struct pixcir_ts_platform_data *pdata = client->dev.platform_data; 131 + const struct pixcir_ts_platform_data *pdata = 132 + dev_get_platdata(&client->dev); 132 133 struct pixcir_i2c_ts_data *tsdata; 133 134 struct input_dev *input; 134 135 int error;
+2 -2
drivers/input/touchscreen/s3c2410_ts.c
··· 251 251 252 252 ts.dev = dev; 253 253 254 - info = pdev->dev.platform_data; 254 + info = dev_get_platdata(&pdev->dev); 255 255 if (!info) { 256 256 dev_err(dev, "no platform data, cannot attach\n"); 257 257 return -EINVAL; ··· 392 392 static int s3c2410ts_resume(struct device *dev) 393 393 { 394 394 struct platform_device *pdev = to_platform_device(dev); 395 - struct s3c2410_ts_mach_info *info = pdev->dev.platform_data; 395 + struct s3c2410_ts_mach_info *info = dev_get_platdata(&pdev->dev); 396 396 397 397 clk_enable(ts.clock); 398 398 enable_irq(ts.irq_tc);
+1 -1
drivers/input/touchscreen/st1232.c
··· 154 154 const struct i2c_device_id *id) 155 155 { 156 156 struct st1232_ts_data *ts; 157 - struct st1232_pdata *pdata = client->dev.platform_data; 157 + struct st1232_pdata *pdata = dev_get_platdata(&client->dev); 158 158 struct input_dev *input_dev; 159 159 int error; 160 160
+1 -1
drivers/input/touchscreen/tsc2005.c
··· 571 571 572 572 static int tsc2005_probe(struct spi_device *spi) 573 573 { 574 - const struct tsc2005_platform_data *pdata = spi->dev.platform_data; 574 + const struct tsc2005_platform_data *pdata = dev_get_platdata(&spi->dev); 575 575 struct tsc2005 *ts; 576 576 struct input_dev *input_dev; 577 577 unsigned int max_x, max_y, max_p;
+4 -4
drivers/input/touchscreen/ucb1400_ts.c
··· 320 320 321 321 static int ucb1400_ts_probe(struct platform_device *pdev) 322 322 { 323 - struct ucb1400_ts *ucb = pdev->dev.platform_data; 323 + struct ucb1400_ts *ucb = dev_get_platdata(&pdev->dev); 324 324 int error, x_res, y_res; 325 325 u16 fcsr; 326 326 ··· 399 399 400 400 static int ucb1400_ts_remove(struct platform_device *pdev) 401 401 { 402 - struct ucb1400_ts *ucb = pdev->dev.platform_data; 402 + struct ucb1400_ts *ucb = dev_get_platdata(&pdev->dev); 403 403 404 404 free_irq(ucb->irq, ucb); 405 405 input_unregister_device(ucb->ts_idev); ··· 410 410 #ifdef CONFIG_PM_SLEEP 411 411 static int ucb1400_ts_suspend(struct device *dev) 412 412 { 413 - struct ucb1400_ts *ucb = dev->platform_data; 413 + struct ucb1400_ts *ucb = dev_get_platdata(dev); 414 414 struct input_dev *idev = ucb->ts_idev; 415 415 416 416 mutex_lock(&idev->mutex); ··· 424 424 425 425 static int ucb1400_ts_resume(struct device *dev) 426 426 { 427 - struct ucb1400_ts *ucb = dev->platform_data; 427 + struct ucb1400_ts *ucb = dev_get_platdata(dev); 428 428 struct input_dev *idev = ucb->ts_idev; 429 429 430 430 mutex_lock(&idev->mutex);
+1 -1
drivers/input/touchscreen/wm97xx-core.c
··· 584 584 static int wm97xx_probe(struct device *dev) 585 585 { 586 586 struct wm97xx *wm; 587 - struct wm97xx_pdata *pdata = dev->platform_data; 587 + struct wm97xx_pdata *pdata = dev_get_platdata(dev); 588 588 int ret = 0, id = 0; 589 589 590 590 wm = kzalloc(sizeof(struct wm97xx), GFP_KERNEL);