Input: joystick - use sizeof(*pointer) instead of sizeof(type)

It is preferred to use sizeof(*pointer) instead of sizeof(type)
due to the type of the variable can change and one needs not
change the former (unlike the latter).

At the same time refactor the code to not use assignment in "if"
conditions.

This patch has no effect on runtime behavior.

Signed-off-by: Erick Archer <erick.archer@outlook.com>
Link: https://lore.kernel.org/r/AS8PR02MB7237FEA55FAC8A9453F2DA6F8BC42@AS8PR02MB7237.eurprd02.prod.outlook.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index fd1827baf27cd3105653f355e33c06a3a2d343b4..15182f16ed198a0fb14e78df4fc1702db8c4dd8c 100644 (file)
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -249,7 +249,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
        int i;
        int err;
 
-       a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL);
+       a3d = kzalloc(sizeof(*a3d), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!a3d || !input_dev) {
                err = -ENOMEM;

diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index f1a720be458b7d46b3b7e24840cf2b01feef04dc..963250de24b7cc5f164873c87c8bcb2f2f0ae7f9 100644 (file)
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -456,7 +456,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
        int i;
        int err;
 
-       port = kzalloc(sizeof(struct adi_port), GFP_KERNEL);
+       port = kzalloc(sizeof(*port), GFP_KERNEL);
        if (!port)
                return -ENOMEM;
 

diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 0c9e172a98181532d19502a10cf0ba88d2775122..c709b58d770a2c99765179a0e862603aa9efc234 100644 (file)
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -582,7 +582,8 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv
        int i;
        int err;
 
-       if (!(port = kzalloc(sizeof(struct analog_port), GFP_KERNEL)))
+       port = kzalloc(sizeof(*port), GFP_KERNEL);
+       if (!port)
                return -ENOMEM;
 
        err = analog_init_port(gameport, drv, port);

diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 407062bcc84be528ecb87ed0c6090455183eb890..49a0dfbbeb49dbe643829eff28aaf0d579fcfd96 100644 (file)
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -237,7 +237,7 @@ static int as5011_probe(struct i2c_client *client)
                return -ENODEV;
        }
 
-       as5011 = kmalloc(sizeof(struct as5011_device), GFP_KERNEL);
+       as5011 = kmalloc(sizeof(*as5011), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!as5011 || !input_dev) {
                dev_err(&client->dev,

diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 7ff78c9388bd3845de46ad51729c22d70df929a0..5a0ea3ad5efad0311790fad53d20aa8c955d7a7b 100644 (file)
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -141,7 +141,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
        int i, j;
        int err;
 
-       cobra = kzalloc(sizeof(struct cobra), GFP_KERNEL);
+       cobra = kzalloc(sizeof(*cobra), GFP_KERNEL);
        if (!cobra)
                return -ENOMEM;
 

diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 4fba28b1a1e75b24537be9aab2c3b5c1567123fb..682a29c27832f82158a772868ac9463386fe0205 100644 (file)
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -587,7 +587,7 @@ static void db9_attach(struct parport *pp)
                return;
        }
 
-       db9 = kzalloc(sizeof(struct db9), GFP_KERNEL);
+       db9 = kzalloc(sizeof(*db9), GFP_KERNEL);
        if (!db9)
                goto err_unreg_pardev;
 

diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 41d5dac05448137f0280ad32241b596665149382..c38de3094553549485168d65dde5c4daea883a7d 100644 (file)
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -950,7 +950,7 @@ static void gc_attach(struct parport *pp)
                return;
        }
 
-       gc = kzalloc(sizeof(struct gc), GFP_KERNEL);
+       gc = kzalloc(sizeof(*gc), GFP_KERNEL);
        if (!gc) {
                pr_err("Not enough memory\n");
                goto err_unreg_pardev;

diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index abefbd1484dfea4480662dde20900f9d1b9909f9..e7ff7bdb1a3aadbd3ae433a6dec745c26672ecd1 100644 (file)
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -222,7 +222,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
        unsigned char data[GF2K_LENGTH];
        int i, err;
 
-       gf2k = kzalloc(sizeof(struct gf2k), GFP_KERNEL);
+       gf2k = kzalloc(sizeof(*gf2k), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!gf2k || !input_dev) {
                err = -ENOMEM;

diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 0e86b269a90ea5ff7a63fbece8ede1417caaf581..f339ce2b7a338b7367b374624f92e1fed5b6e53d 100644 (file)
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -284,7 +284,8 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
        int i, j, t;
        int err;
 
-       if (!(grip = kzalloc(sizeof(struct grip), GFP_KERNEL)))
+       grip = kzalloc(sizeof(*grip), GFP_KERNEL);
+       if (!grip)
                return -ENOMEM;
 
        grip->gameport = gameport;

diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 056a89ac2bdff787416a6e8287a60c9c9b73e2ec..5eadb5a3ca37f6119af173dbdff9231b3a1a5180 100644 (file)
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -632,7 +632,8 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
        struct grip_mp *grip;
        int err;
 
-       if (!(grip = kzalloc(sizeof(struct grip_mp), GFP_KERNEL)))
+       grip = kzalloc(sizeof(*grip), GFP_KERNEL);
+       if (!grip)
                return -ENOMEM;
 
        grip->gameport = gameport;

diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index 205eb6f8b84d2633e40dd0fd961103efac0420cf..1c5a76f72239cd4a11dccb8c39071d2ee16d23e5 100644 (file)
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -163,7 +163,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
        int i, t;
        int err;
 
-       guillemot = kzalloc(sizeof(struct guillemot), GFP_KERNEL);
+       guillemot = kzalloc(sizeof(*guillemot), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!guillemot || !input_dev) {
                err = -ENOMEM;

diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 03a9f0829f7ed092f0413534a9b201ff4afedb66..262f022e5695d5a03620c6c953d918757dcb66cc 100644 (file)
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -192,7 +192,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
        int i, t;
        int err;
 
-       interact = kzalloc(sizeof(struct interact), GFP_KERNEL);
+       interact = kzalloc(sizeof(*interact), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!interact || !input_dev) {
                err = -ENOMEM;

diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 017ef8c6170b75eebe301665e01930a5897f22a2..2eaa25c9c68c259141eadb60f2126db65a6ed149 100644 (file)
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -132,7 +132,7 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)
        int err = -ENOMEM;
        int i;
 
-       magellan = kzalloc(sizeof(struct magellan), GFP_KERNEL);
+       magellan = kzalloc(sizeof(*magellan), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!magellan || !input_dev)
                goto fail1;

diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index 3833ac47b2b8cf205458eba57a817e95b58d9c12..8b54f9b18e7c06796429a9385e8488de4e9096e9 100644 (file)
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -102,7 +102,7 @@ static int probe_maple_controller(struct device *dev)
        struct input_dev *idev;
        unsigned long data = be32_to_cpu(mdev->devinfo.function_data[0]);
 
-       pad = kzalloc(sizeof(struct dc_pad), GFP_KERNEL);
+       pad = kzalloc(sizeof(*pad), GFP_KERNEL);
        idev = input_allocate_device();
        if (!pad || !idev) {
                error = -ENOMEM;

diff --git a/drivers/input/joystick/n64joy.c b/drivers/input/joystick/n64joy.c
index 9dbca366613e575983f785a1d2459f1d68a7f65d..b0986d2195d6896f0e1581c2545d09cd7fe2d4fc 100644 (file)
--- a/drivers/input/joystick/n64joy.c
+++ b/drivers/input/joystick/n64joy.c
@@ -246,7 +246,7 @@ static int __init n64joy_probe(struct platform_device *pdev)
        int err = 0;
        u32 i, j, found = 0;
 
-       priv = kzalloc(sizeof(struct n64joy_priv), GFP_KERNEL);
+       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
        mutex_init(&priv->n64joy_mutex);

diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 7282301c3ae73a1e5ad9c96ed952d90e3cfaa114..f6e92db4d78965e58ee40db09d7ed04ec017fa90 100644 (file)
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -577,7 +577,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
 
        comment[0] = 0;
 
-       sw = kzalloc(sizeof(struct sw), GFP_KERNEL);
+       sw = kzalloc(sizeof(*sw), GFP_KERNEL);
        buf = kmalloc(SW_LENGTH, GFP_KERNEL);
        idbuf = kmalloc(SW_LENGTH, GFP_KERNEL);
        if (!sw || !buf || !idbuf) {

diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index fa8ec533cd6967a24cd52206beb7483c6952c524..49101f1c858b4d47c589f12ee64f39e3e2f787cf 100644 (file)
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -199,7 +199,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
        if ((id = serio->id.id) > SPACEBALL_MAX_ID)
                return -ENODEV;
 
-       spaceball = kmalloc(sizeof(struct spaceball), GFP_KERNEL);
+       spaceball = kmalloc(sizeof(*spaceball), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!spaceball || !input_dev)
                goto fail1;

diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index dbbc69f17c89a735e1982e49956a307c166647ef..7250d74d62a19e1e86c3d1d6bdde41ea6e1ca45f 100644 (file)
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -147,7 +147,7 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
        int err = -ENOMEM;
        int i;
 
-       spaceorb = kzalloc(sizeof(struct spaceorb), GFP_KERNEL);
+       spaceorb = kzalloc(sizeof(*spaceorb), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!spaceorb || !input_dev)
                goto fail1;

diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index 530de468cb6171bf77572ea92bf9f58b74536d71..1b24ea21aa304f1894c19008465f59b9567eba0b 100644 (file)
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -118,7 +118,7 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
        struct input_dev *input_dev;
        int err = -ENOMEM;
 
-       stinger = kmalloc(sizeof(struct stinger), GFP_KERNEL);
+       stinger = kmalloc(sizeof(*stinger), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!stinger || !input_dev)
                goto fail1;

diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 93562ecc0ca1c03888e34c2bf0829f7b70b1fbda..514b1026e379495bd55276c4c0e063caf2980796 100644 (file)
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -348,7 +348,8 @@ static int tmdc_connect(struct gameport *gameport, struct gameport_driver *drv)
        int i;
        int err;
 
-       if (!(tmdc = kzalloc(sizeof(struct tmdc), GFP_KERNEL)))
+       tmdc = kzalloc(sizeof(*tmdc), GFP_KERNEL);
+       if (!tmdc)
                return -ENOMEM;
 
        tmdc->gameport = gameport;

diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index dfb9c684651f355b34bfd1d11447c96869b55b08..eb8455c34e67817beb54777871450e65c1fdeb03 100644 (file)
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -172,7 +172,7 @@ static void tgfx_attach(struct parport *pp)
                return;
        }
 
-       tgfx = kzalloc(sizeof(struct tgfx), GFP_KERNEL);
+       tgfx = kzalloc(sizeof(*tgfx), GFP_KERNEL);
        if (!tgfx) {
                printk(KERN_ERR "turbografx.c: Not enough memory\n");
                goto err_unreg_pardev;

diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index 9b6792ac27f10c693e7c4cc2dbb06824d398bc0c..ab99d76e5d8db6fb4cc29bffcde882a7e7510b72 100644 (file)
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -171,7 +171,7 @@ static int twidjoy_connect(struct serio *serio, struct serio_driver *drv)
        int err = -ENOMEM;
        int i;
 
-       twidjoy = kzalloc(sizeof(struct twidjoy), GFP_KERNEL);
+       twidjoy = kzalloc(sizeof(*twidjoy), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!twidjoy || !input_dev)
                goto fail1;

diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index f66bddf145c22af99f8481577b28cefaa4ff9841..ebeab441e9ec8e0aa10594c3886e66290f5b8745 100644 (file)
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -124,7 +124,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
        struct input_dev *input_dev;
        int err = -ENOMEM;
 
-       warrior = kzalloc(sizeof(struct warrior), GFP_KERNEL);
+       warrior = kzalloc(sizeof(*warrior), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!warrior || !input_dev)
                goto fail1;

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 70f0654c58b6a1e8dcf7bb4e63cdafb810003693..40a4ddee0b141fe67e971c9340ceb9dd73983f69 100644 (file)
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1686,7 +1686,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
        if (xpad->xtype != XTYPE_XBOX360 && xpad->xtype != XTYPE_XBOX360W)
                return 0;
 
-       xpad->led = led = kzalloc(sizeof(struct xpad_led), GFP_KERNEL);
+       xpad->led = led = kzalloc(sizeof(*led), GFP_KERNEL);
        if (!led)
                return -ENOMEM;
 
@@ -2022,7 +2022,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                        break;
        }
 
-       xpad = kzalloc(sizeof(struct usb_xpad), GFP_KERNEL);
+       xpad = kzalloc(sizeof(*xpad), GFP_KERNEL);
        if (!xpad)
                return -ENOMEM;
 

diff --git a/drivers/input/joystick/zhenhua.c b/drivers/input/joystick/zhenhua.c
index 3f2460e2b095597144f42a2890800a879dbceac7..cc0e2a77ac5e4d7fe9ceddd1db8c11b6260a1c28 100644 (file)
--- a/drivers/input/joystick/zhenhua.c
+++ b/drivers/input/joystick/zhenhua.c
@@ -131,7 +131,7 @@ static int zhenhua_connect(struct serio *serio, struct serio_driver *drv)
        struct input_dev *input_dev;
        int err = -ENOMEM;
 
-       zhenhua = kzalloc(sizeof(struct zhenhua), GFP_KERNEL);
+       zhenhua = kzalloc(sizeof(*zhenhua), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!zhenhua || !input_dev)
                goto fail1;