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

drivers: pnp: isapnp: proc.c: Remove unnecessary local variables

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>

authored by

Anupama K Patil and committed by
Rafael J. Wysocki
daadabfb d07f6ca9

+6 -7
+6 -7
drivers/pnp/isapnp/proc.c
··· 57 57 static int isapnp_proc_attach_device(struct pnp_dev *dev) 58 58 { 59 59 struct pnp_card *bus = dev->card; 60 - struct proc_dir_entry *de, *e; 61 60 char name[16]; 62 61 63 - if (!(de = bus->procdir)) { 62 + if (!bus->procdir) { 64 63 sprintf(name, "%02x", bus->number); 65 - de = bus->procdir = proc_mkdir(name, isapnp_proc_bus_dir); 66 - if (!de) 64 + bus->procdir = proc_mkdir(name, isapnp_proc_bus_dir); 65 + if (!bus->procdir) 67 66 return -ENOMEM; 68 67 } 69 68 sprintf(name, "%02x", dev->number); 70 - e = dev->procent = proc_create_data(name, S_IFREG | S_IRUGO, de, 69 + dev->procent = proc_create_data(name, S_IFREG | S_IRUGO, bus->procdir, 71 70 &isapnp_proc_bus_proc_ops, dev); 72 - if (!e) 71 + if (!dev->procent) 73 72 return -ENOMEM; 74 - proc_set_size(e, 256); 73 + proc_set_size(dev->procent, 256); 75 74 return 0; 76 75 } 77 76