[PATCH] mfd: max8925-i2c: Drop unnecessary static

[PATCH] mfd: max8925-i2c: Drop unnecessary static

[Loic]

Hello,

Please picked up this patch for linux 4.4 and 4.9.
Compiled/tested without problem.

[ Upstream commit 0953075112d7626474b0bb88690f5f1ab93ec803 ]

From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Thu, 4 May 2017 22:10:54 +0200
Subject: [PATCH] mfd: max8925-i2c: Drop unnecessary static

Drop static on a local variable, when the variable is initialized before
any use, on every possible execution path through the function.  The static
has no benefit, and dropping it reduces the code size.

The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@bad exists@
position p;
identifier x;
type T;
@@

static T x@p;
...
x = <+...x...+>

@@
identifier x;
expression e;
type T;
position p != bad.p;
@@

-static
 T x@p;
 ... when != x
     when strict
?x = e;
// </smpl>

The change in code size is indicates by the following output from the size
command.

before:
   text    data     bss     dec     hex filename
   2579     240      16    2835     b13 drivers/mfd/max8925-i2c.o

after:
   text    data     bss     dec     hex filename
   2531     240       8    2779     adb drivers/mfd/max8925-i2c.o

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/max8925-i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index 5c80aea3211fd..10063236132c1 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -151,7 +151,7 @@ static int max8925_probe(struct i2c_client *client,
 				   const struct i2c_device_id *id)
 {
 	struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
-	static struct max8925_chip *chip;
+	struct max8925_chip *chip;
 	struct device_node *node = client->dev.of_node;
 
 	if (node && !pdata) {

Re: [PATCH] mfd: max8925-i2c: Drop unnecessary static

[Sasha Levin]

On Sat, Oct 20, 2018 at 08:07:41PM +0200, Loic wrote:
>Hello,
>
>Please picked up this patch for linux 4.4 and 4.9.
>Compiled/tested without problem.
>
>[ Upstream commit 0953075112d7626474b0bb88690f5f1ab93ec803 ]
>
>From: Julia Lawall <Julia.Lawall@lip6.fr>
>Date: Thu, 4 May 2017 22:10:54 +0200
>Subject: [PATCH] mfd: max8925-i2c: Drop unnecessary static
>
>Drop static on a local variable, when the variable is initialized before
>any use, on every possible execution path through the function.  The static
>has no benefit, and dropping it reduces the code size.
>
>The semantic patch that fixes this problem is as follows:
>(http://coccinelle.lip6.fr/)
>
>// <smpl>
>@bad exists@
>position p;
>identifier x;
>type T;
>@@
>
>static T x@p;
>...
>x = <+...x...+>
>
>@@
>identifier x;
>expression e;
>type T;
>position p != bad.p;
>@@
>
>-static
> T x@p;
> ... when != x
>     when strict
>?x = e;
>// </smpl>
>
>The change in code size is indicates by the following output from the size
>command.
>
>before:
>   text    data     bss     dec     hex filename
>   2579     240      16    2835     b13 drivers/mfd/max8925-i2c.o
>
>after:
>   text    data     bss     dec     hex filename
>   2531     240       8    2779     adb drivers/mfd/max8925-i2c.o
>
>Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>Acked-by: Kees Cook <keescook@chromium.org>
>Signed-off-by: Lee Jones <lee.jones@linaro.org>

This doesn't really fix anything, not even a harmless warning, so I'd
rather leave it out.

--
Thanks,
Sasha