diff mbox

[3/9] drivers/net: Eliminate useless code

Message ID Pine.LNX.4.64.1001161657400.28745@ask.diku.dk
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Julia Lawall Jan. 16, 2010, 3:57 p.m. UTC
From: Julia Lawall <julia@diku.dk>

The variable qdev is initialized twice to the same (side effect-free)
expression.  Drop one initialization.

A simplified version of the semantic match that finds this problem is:
(http://coccinelle.lip6.fr/)

// <smpl>
@forall@
idexpression *x;
identifier f!=ERR_PTR;
@@

x = f(...)
... when != x
(
x = f(...,<+...x...+>,...)
|
* x = f(...)
)
// </smpl>

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

---
 drivers/net/qla3xxx.c               |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Jan. 18, 2010, 3:31 a.m. UTC | #1
From: Julia Lawall <julia@diku.dk>
Date: Sat, 16 Jan 2010 16:57:56 +0100 (CET)

> The variable qdev is initialized twice to the same (side effect-free)
> expression.  Drop one initialization.
> 
> A simplified version of the semantic match that finds this problem is:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @forall@
> idexpression *x;
> identifier f!=ERR_PTR;
> @@
> 
> x = f(...)
> ... when != x
> (
> x = f(...,<+...x...+>,...)
> |
> * x = f(...)
> )
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>

Something in your patch creation process is corrupting these
patches.

> diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
> index f922294..4ef0afb 100644
> --- a/drivers/net/qla3xxx.c
> +++ b/drivers/net/qla3xxx.c
> @@ -4087,9 +4087,8 @@ static void __devexit ql3xxx_remove(struct pci_dev *pdev)
>  	struct ql3_adapter *qdev = netdev_priv(ndev);
>  
>  	unregister_netdev(ndev);
> -	qdev = netdev_priv(ndev);
>  
>  	ql_disable_interrupts(qdev);
>  
> --

That hunk header states that after the line is removed there should
be 8 lines present in the hunk, but the patch only shows 7 such
lines.

I suspect something is eating the final line of your patches.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julia Lawall Jan. 18, 2010, 5:47 a.m. UTC | #2
On Sun, 17 Jan 2010, David Miller wrote:

> From: Julia Lawall <julia@diku.dk>
> Date: Sat, 16 Jan 2010 16:57:56 +0100 (CET)
> 
> > The variable qdev is initialized twice to the same (side effect-free)
> > expression.  Drop one initialization.
> > 
> > A simplified version of the semantic match that finds this problem is:
> > (http://coccinelle.lip6.fr/)
> > 
> > // <smpl>
> > @forall@
> > idexpression *x;
> > identifier f!=ERR_PTR;
> > @@
> > 
> > x = f(...)
> > ... when != x
> > (
> > x = f(...,<+...x...+>,...)
> > |
> > * x = f(...)
> > )
> > // </smpl>
> > 
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> 
> Something in your patch creation process is corrupting these
> patches.
> 
> > diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
> > index f922294..4ef0afb 100644
> > --- a/drivers/net/qla3xxx.c
> > +++ b/drivers/net/qla3xxx.c
> > @@ -4087,9 +4087,8 @@ static void __devexit ql3xxx_remove(struct pci_dev *pdev)
> >  	struct ql3_adapter *qdev = netdev_priv(ndev);
> >  
> >  	unregister_netdev(ndev);
> > -	qdev = netdev_priv(ndev);
> >  
> >  	ql_disable_interrupts(qdev);
> >  
> > --
> 
> That hunk header states that after the line is removed there should
> be 8 lines present in the hunk, but the patch only shows 7 such
> lines.
> 
> I suspect something is eating the final line of your patches.

Oops, sorry.  I will try again.  I'm surprised that checkpatch didn't 
complain.

julia
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index f922294..4ef0afb 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -4087,9 +4087,8 @@  static void __devexit ql3xxx_remove(struct pci_dev *pdev)
 	struct ql3_adapter *qdev = netdev_priv(ndev);
 
 	unregister_netdev(ndev);
-	qdev = netdev_priv(ndev);
 
 	ql_disable_interrupts(qdev);
 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org