[PATCH 0/4] delete useless initialization

[PATCH 0/4] delete useless initialization

[Julia Lawall]

These patches fix cases where a variable is initialized in some non-trivial
way, and the result is immediately overwritten with the result of some
allocation function.

[PATCH 1/4] fs/ext3/balloc.c: delete useless initialization

[Julia Lawall]

From: Julia Lawall <julia@diku.dk>

Delete nontrivial initialization that is immediately overwritten by the
result of an allocation function.

The semantic match that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
identifier i;
expression e;
@@

(
T i = \(0\|NULL\|ERR_PTR(...)\);
|
-T i = e;
+T i;
)
... when != i
i = \(kzalloc\|kcalloc\|kmalloc\)(...);

// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 fs/ext3/balloc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -u -p a/fs/ext3/balloc.c b/fs/ext3/balloc.c
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -427,7 +427,7 @@ static inline int rsv_is_empty(struct ex
 void ext3_init_block_alloc_info(struct inode *inode)
 {
 	struct ext3_inode_info *ei = EXT3_I(inode);
-	struct ext3_block_alloc_info *block_i = ei->i_block_alloc_info;
+	struct ext3_block_alloc_info *block_i;
 	struct super_block *sb = inode->i_sb;
 
 	block_i = kmalloc(sizeof(*block_i), GFP_NOFS);

Re: [PATCH 1/4] fs/ext3/balloc.c: delete useless initialization

[Jan Kara]

On Thu 04-08-11 12:29:31, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
> 
> Delete nontrivial initialization that is immediately overwritten by the
> result of an allocation function.
  Thanks. Merged.

								Honza

> 
> The semantic match that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@
> type T;
> identifier i;
> expression e;
> @@
> 
> (
> T i = \(0\|NULL\|ERR_PTR(...)\);
> |
> -T i = e;
> +T i;
> )
> ... when != i
> i = \(kzalloc\|kcalloc\|kmalloc\)(...);
> 
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>
> 
> ---
>  fs/ext3/balloc.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -u -p a/fs/ext3/balloc.c b/fs/ext3/balloc.c
> --- a/fs/ext3/balloc.c
> +++ b/fs/ext3/balloc.c
> @@ -427,7 +427,7 @@ static inline int rsv_is_empty(struct ex
>  void ext3_init_block_alloc_info(struct inode *inode)
>  {
>  	struct ext3_inode_info *ei = EXT3_I(inode);
> -	struct ext3_block_alloc_info *block_i = ei->i_block_alloc_info;
> +	struct ext3_block_alloc_info *block_i;
>  	struct super_block *sb = inode->i_sb;
>  
>  	block_i = kmalloc(sizeof(*block_i), GFP_NOFS);
> 
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

[PATCH 2/4] fs/ext2/balloc.c: delete useless initialization

[Julia Lawall]

From: Julia Lawall <julia@diku.dk>

Delete nontrivial initialization that is immediately overwritten by the
result of an allocation function.

The semantic match that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
identifier i;
expression e;
@@

(
T i = \(0\|NULL\|ERR_PTR(...)\);
|
-T i = e;
+T i;
)
... when != i
i = \(kzalloc\|kcalloc\|kmalloc\)(...);

// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 fs/ext2/balloc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -u -p a/fs/ext2/balloc.c b/fs/ext2/balloc.c
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -421,7 +421,7 @@ static inline int rsv_is_empty(struct ex
 void ext2_init_block_alloc_info(struct inode *inode)
 {
 	struct ext2_inode_info *ei = EXT2_I(inode);
-	struct ext2_block_alloc_info *block_i = ei->i_block_alloc_info;
+	struct ext2_block_alloc_info *block_i;
 	struct super_block *sb = inode->i_sb;
 
 	block_i = kmalloc(sizeof(*block_i), GFP_NOFS);

Re: [PATCH 2/4] fs/ext2/balloc.c: delete useless initialization

[Jan Kara]

On Thu 04-08-11 12:29:32, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
> 
> Delete nontrivial initialization that is immediately overwritten by the
> result of an allocation function.
  Thanks. Merged.

								Honza
> 
> The semantic match that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@
> type T;
> identifier i;
> expression e;
> @@
> 
> (
> T i = \(0\|NULL\|ERR_PTR(...)\);
> |
> -T i = e;
> +T i;
> )
> ... when != i
> i = \(kzalloc\|kcalloc\|kmalloc\)(...);
> 
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>
> 
> ---
>  fs/ext2/balloc.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -u -p a/fs/ext2/balloc.c b/fs/ext2/balloc.c
> --- a/fs/ext2/balloc.c
> +++ b/fs/ext2/balloc.c
> @@ -421,7 +421,7 @@ static inline int rsv_is_empty(struct ex
>  void ext2_init_block_alloc_info(struct inode *inode)
>  {
>  	struct ext2_inode_info *ei = EXT2_I(inode);
> -	struct ext2_block_alloc_info *block_i = ei->i_block_alloc_info;
> +	struct ext2_block_alloc_info *block_i;
>  	struct super_block *sb = inode->i_sb;
>  
>  	block_i = kmalloc(sizeof(*block_i), GFP_NOFS);
> 
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

[PATCH 3/4] drivers/media/video/hexium_gemini.c: delete useless initialization

[Julia Lawall]

From: Julia Lawall <julia@diku.dk>

Delete nontrivial initialization that is immediately overwritten by the
result of an allocation function.

The semantic match that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
identifier i;
expression e;
@@

(
T i = \(0\|NULL\|ERR_PTR(...)\);
|
-T i = e;
+T i;
)
... when != i
i = \(kzalloc\|kcalloc\|kmalloc\)(...);

// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 drivers/media/video/hexium_gemini.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -u -p a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -352,7 +352,7 @@ static struct saa7146_ext_vv vv_data;
 /* this function only gets called when the probing was successful */
 static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)
 {
-	struct hexium *hexium = (struct hexium *) dev->ext_priv;
+	struct hexium *hexium;
 	int ret;
 
 	DEB_EE((".\n"));

Re: [PATCH 3/4] drivers/media/video/hexium_gemini.c: delete useless

[Jean Delvare]

Hi Julia,

On Thu,  4 Aug 2011 12:29:33 +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
> 
> Delete nontrivial initialization that is immediately overwritten by the
> result of an allocation function.
> (...)
> Signed-off-by: Julia Lawall <julia@diku.dk>
> 
> ---
>  drivers/media/video/hexium_gemini.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -u -p a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
> --- a/drivers/media/video/hexium_gemini.c
> +++ b/drivers/media/video/hexium_gemini.c
> @@ -352,7 +352,7 @@ static struct saa7146_ext_vv vv_data;
>  /* this function only gets called when the probing was successful */
>  static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)
>  {
> -	struct hexium *hexium = (struct hexium *) dev->ext_priv;
> +	struct hexium *hexium;
>  	int ret;
>  
>  	DEB_EE((".\n"));
> 

Looks correct.

Acked-by: Jean Delvare <khali@linux-fr.org>

-- 
Jean Delvare

[PATCH 4/4] drivers/leds/leds-pca9532.c: delete useless initialization

[Julia Lawall]

From: Julia Lawall <julia@diku.dk>

Delete nontrivial initialization that is immediately overwritten by the
result of an allocation function.

The semantic match that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
identifier i;
expression e;
@@

(
T i = \(0\|NULL\|ERR_PTR(...)\);
|
-T i = e;
+T i;
)
... when != i
i = \(kzalloc\|kcalloc\|kmalloc\)(...);

// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 drivers/leds/leds-pca9532.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -u -p a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -447,7 +447,7 @@ exit:
 static int pca9532_probe(struct i2c_client *client,
 	const struct i2c_device_id *id)
 {
-	struct pca9532_data *data = i2c_get_clientdata(client);
+	struct pca9532_data *data;
 	struct pca9532_platform_data *pca9532_pdata = client->dev.platform_data;
 	int err;
 

Re: [PATCH 4/4] drivers/leds/leds-pca9532.c: delete useless

[Wolfram Sang]

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

On Thu, Aug 04, 2011 at 12:29:34PM +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
> 
> Delete nontrivial initialization that is immediately overwritten by the
> result of an allocation function.
> 
> The semantic match that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@
> type T;
> identifier i;
> expression e;
> @@
> 
> (
> T i = \(0\|NULL\|ERR_PTR(...)\);
> |
> -T i = e;
> +T i;
> )
> ... when != i
> i = \(kzalloc\|kcalloc\|kmalloc\)(...);
> 
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

BTW LED patches seem to go via akpm these days...

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]