Input: keyboard - drop calls to platform_set_drvdata and i2c_set_clientdata

There is no call to i2c_get_clientdata(), platform_get_drvdata(),
or dev_get_drvdata() in any of the drivers in this patch.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/adc-keys.c b/drivers/input/keyboard/adc-keys.c
index f8cf2ccacefd3655b9a6751ed0c63dd63f94621b..c255af21e71ab58b6e9b6ef8c905ca7b02f8b14a 100644 (file)
--- a/drivers/input/keyboard/adc-keys.c
+++ b/drivers/input/keyboard/adc-keys.c
@@ -148,8 +148,6 @@ static int adc_keys_probe(struct platform_device *pdev)
        if (error)
                return error;
 
-       platform_set_drvdata(pdev, st);
-
        poll_dev = devm_input_allocate_polled_device(dev);
        if (!poll_dev) {
                dev_err(dev, "failed to allocate input device\n");

diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
index 4401be225d64b28b8ffa798ba71cce07c8a81282..1a1eacae3ea14295f7b1284d83dd9b0f68ef7a29 100644 (file)
--- a/drivers/input/keyboard/cap11xx.c
+++ b/drivers/input/keyboard/cap11xx.c
@@ -392,7 +392,6 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
                return error;
 
        dev_info(dev, "CAP11XX detected, revision 0x%02x\n", rev);
-       i2c_set_clientdata(i2c_client, priv);
        node = dev->of_node;
 
        if (!of_property_read_u32(node, "microchip,sensor-gain", &gain32)) {

diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index bed4f2086158e3073b325dcc75fbcac3c51df4da..cc193e665358f1bcbc02a2d2df7f40109f37d540 100644 (file)
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -365,7 +365,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
        bdev->poll_dev = poll_dev;
        bdev->dev = dev;
        bdev->pdata = pdata;
-       platform_set_drvdata(pdev, bdev);
 
        error = input_register_polled_device(poll_dev);
        if (error) {

diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c
index 80c81278ad2c39b6cbddd1b80452c4798a4014d7..0116ac99f44ce110ea060b1e52f8bdbd291f5378 100644 (file)
--- a/drivers/input/keyboard/jornada680_kbd.c
+++ b/drivers/input/keyboard/jornada680_kbd.c
@@ -197,8 +197,6 @@ static int jornada680kbd_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       platform_set_drvdata(pdev, jornadakbd);
-
        jornadakbd->poll_dev = poll_dev;
 
        memcpy(jornadakbd->keymap, jornada_scancodes,

diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c
index 5091133b7b8eac7d2c89da972dbefc6ce8164787..cd44d22d8770388e19a56f5fc01f8c9c380042ca 100644 (file)
--- a/drivers/input/keyboard/max7359_keypad.c
+++ b/drivers/input/keyboard/max7359_keypad.c
@@ -241,7 +241,6 @@ static int max7359_probe(struct i2c_client *client,
        /* Initialize MAX7359 */
        max7359_initialize(client);
 
-       i2c_set_clientdata(client, keypad);
        device_init_wakeup(&client->dev, 1);
 
        return 0;

diff --git a/drivers/input/keyboard/nspire-keypad.c b/drivers/input/keyboard/nspire-keypad.c
index 7abfd34eb87ec5f7f1df56fbb307058c0cee3cdf..c7f26fa3034cac33b9e098a1a1a806648f7637ae 100644 (file)
--- a/drivers/input/keyboard/nspire-keypad.c
+++ b/drivers/input/keyboard/nspire-keypad.c
@@ -249,8 +249,6 @@ static int nspire_keypad_probe(struct platform_device *pdev)
                return error;
        }
 
-       platform_set_drvdata(pdev, keypad);
-
        dev_dbg(&pdev->dev,
                "TI-NSPIRE keypad at %pR (scan_interval=%uus, row_delay=%uus%s)\n",
                res, keypad->row_delay, keypad->scan_interval,

diff --git a/drivers/input/keyboard/opencores-kbd.c b/drivers/input/keyboard/opencores-kbd.c
index f8502bb291767c539d1a204ed34bc09d3e90c4b0..98ea6190f5f5f537f817b7c5689ec44728f8a316 100644 (file)
--- a/drivers/input/keyboard/opencores-kbd.c
+++ b/drivers/input/keyboard/opencores-kbd.c
@@ -112,8 +112,6 @@ static int opencores_kbd_probe(struct platform_device *pdev)
                return error;
        }
 
-       platform_set_drvdata(pdev, opencores_kbd);
-
        return 0;
 }
 

diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c
index cc8f7ddcee53f1d94ff741ad6de03c3dea3f6910..a37c172452e6349780b66dc2c1c5075d4e4a246f 100644 (file)
--- a/drivers/input/keyboard/sun4i-lradc-keys.c
+++ b/drivers/input/keyboard/sun4i-lradc-keys.c
@@ -261,7 +261,6 @@ static int sun4i_lradc_probe(struct platform_device *pdev)
        if (error)
                return error;
 
-       platform_set_drvdata(pdev, lradc);
        return 0;
 }