summary refs log tree commit diff
path: root/drivers/pnp
diff options
context:
space:
mode:
authorAnupama K Patil <anupamakpatil123@gmail.com>2021-04-29 01:09:01 +0530
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-05-17 16:47:59 +0200
commitdaadabfbd36d57a158623fa81585a4e9aa954c53 (patch)
tree6983709c0c19efa0076c358b40732779f156ef29 /drivers/pnp
parentd07f6ca923ea0927a1024dfccafc5b53b61cfecc (diff)
downloadlinux-daadabfbd36d57a158623fa81585a4e9aa954c53.tar.gz
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>
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/isapnp/proc.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index 785a796430fa..1ae458c02656 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -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;
 }