[PATCH v2] drivers: pnp: proc.c: Removed unnecessary variables

[PATCH v2] drivers: pnp: proc.c: Removed unnecessary variables

[Anupama K Patil]

[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]

de, e are two variables of the type 'struct proc_dir_entry'
which can be removed to save memory. This also fixes a coding style
issue reported by checkpatch where we are suggested to make assignment
outside the if statement.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Anupama K Patil <anupamakpatil123@gmail.com>
---
v2: Added Reviewed-by: tag

 drivers/pnp/isapnp/proc.c | 13 ++++++-------
 1 file 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;
 }
 
-- 
2.25.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH v2] drivers: pnp: proc.c: Removed unnecessary variables

[Rafael J. Wysocki]

On Wed, Apr 28, 2021 at 9:39 PM Anupama K Patil
<anupamakpatil123@gmail.com> wrote:
>
> de, e are two variables of the type 'struct proc_dir_entry'
> which can be removed to save memory. This also fixes a coding style
> issue reported by checkpatch where we are suggested to make assignment
> outside the if statement.
>
> Reviewed-by: Jaroslav Kysela <perex@perex.cz>
> Signed-off-by: Anupama K Patil <anupamakpatil123@gmail.com>
> ---
> v2: Added Reviewed-by: tag
>
>  drivers/pnp/isapnp/proc.c | 13 ++++++-------
>  1 file 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;
>  }
>
> --

Applied as 5.14 material with edits in the subject and changelog, thanks!