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

[Julia Lawall]

From: Julia Lawall <ju...@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 <ju...@diku.dk>

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

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 linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[David Miller]

From: Julia Lawall <ju...@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 <ju...@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.

[Julia Lawall]

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

julia

[Julia Lawall]

From: Julia Lawall <ju...@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 <ju...@diku.dk>

---

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

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,7 +4087,6 @@ 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);

--

[David Miller]

From: Julia Lawall <ju...@diku.dk>
Date: Mon, 18 Jan 2010 09:12:21 +0100 (CET)

> From: Julia Lawall <ju...@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/)

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

Applied, thanks.