drivers: pnp: isapnp: proc.c: Remove unnecessary local variables
authorAnupama K Patil <anupamakpatil123@gmail.com>
Wed, 28 Apr 2021 19:39:01 +0000 (01:09 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 17 May 2021 14:47:59 +0000 (16:47 +0200)
In the PNP code, there are two redundant local variables that can be
dropped.

This also fixes a coding style issue reported by checkpatch about an
assignment made under an if () statement.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Anupama K Patil <anupamakpatil123@gmail.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/pnp/isapnp/proc.c

index 785a796430fa7963e0f40bdfa8b94184ddc9f90c..1ae458c02656cb152ec1cd7fea49d1f0d108446e 100644 (file)
@@ -57,21 +57,20 @@ static const struct proc_ops isapnp_proc_bus_proc_ops = {
 static int isapnp_proc_attach_device(struct pnp_dev *dev)
 {
        struct pnp_card *bus = dev->card;
-       struct proc_dir_entry *de, *e;
        char name[16];
 
-       if (!(de = bus->procdir)) {
+       if (!bus->procdir) {
                sprintf(name, "%02x", bus->number);
-               de = bus->procdir = proc_mkdir(name, isapnp_proc_bus_dir);
-               if (!de)
+               bus->procdir = proc_mkdir(name, isapnp_proc_bus_dir);
+               if (!bus->procdir)
                        return -ENOMEM;
        }
        sprintf(name, "%02x", dev->number);
-       e = dev->procent = proc_create_data(name, S_IFREG | S_IRUGO, de,
+       dev->procent = proc_create_data(name, S_IFREG | S_IRUGO, bus->procdir,
                                            &isapnp_proc_bus_proc_ops, dev);
-       if (!e)
+       if (!dev->procent)
                return -ENOMEM;
-       proc_set_size(e, 256);
+       proc_set_size(dev->procent, 256);
        return 0;
 }