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 fd1827b..15182f1 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 f1a720b..963250d 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 0c9e172..c709b58 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 407062b..49a0dfb 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 7ff78c9..5a0ea3a 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 4fba28b..682a29c 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 41d5dac..c38de30 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 abefbd1..e7ff7bd 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 0e86b26..f339ce2 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 056a89a..5eadb5a 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 205eb6f..1c5a76f 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 03a9f08..262f022 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 017ef8c..2eaa25c 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 3833ac4..8b54f9b 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 9dbca36..b0986d2 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 7282301..f6e92db 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 fa8ec53..49101f1 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 dbbc69f..7250d74 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 530de46..1b24ea2 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 93562ec..514b102 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 dfb9c68..eb8455c 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 9b6792a..ab99d76 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 f66bddf..ebeab44 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 70f0654..40a4dde 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 3f2460e..cc0e2a7 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;