2014-01-02 15:32:46

by Julia Lawall

Subject: [PATCH] net: tulip: delete useless tests on netdev_priv

From: Julia Lawall <[email protected]>

Netdev_priv performs an addition, not a pointer dereference, so it seems
quit unlikely that its result would ever be NULL.

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

// <smpl>
@@
statement S;
@@

- if (!netdev_priv(...)) S
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>

---
drivers/net/ethernet/dec/tulip/uli526x.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index a5397b1..aa4ee38 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -1192,9 +1192,6 @@ static int uli526x_suspend(struct pci_dev *pdev, pm_message_t state)

ULI526X_DBUG(0, "uli526x_suspend", 0);

- if (!netdev_priv(dev))
- return 0;
-
pci_save_state(pdev);

if (!netif_running(dev))
@@ -1228,9 +1225,6 @@ static int uli526x_resume(struct pci_dev *pdev)

ULI526X_DBUG(0, "uli526x_resume", 0);

- if (!netdev_priv(dev))
- return 0;
-
pci_restore_state(pdev);

if (!netif_running(dev))

2014-01-02 15:57:28

by Grant Grundler

Subject: Re: [PATCH] net: tulip: delete useless tests on netdev_priv

On Thu, Jan 2, 2014 at 8:28 AM, Julia Lawall <[email protected]> wrote:
> From: Julia Lawall <[email protected]>
>
> Netdev_priv performs an addition, not a pointer dereference, so it seems
> quit unlikely that its result would ever be NULL.

LGTM.

>
> A semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> statement S;
> @@
>
> - if (!netdev_priv(...)) S
> // </smpl>
>
> Signed-off-by: Julia Lawall <[email protected]>

Acked-by: Grant Grundler <[email protected]>

cheers,
grant

>
> ---
> drivers/net/ethernet/dec/tulip/uli526x.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
> index a5397b1..aa4ee38 100644
> --- a/drivers/net/ethernet/dec/tulip/uli526x.c
> +++ b/drivers/net/ethernet/dec/tulip/uli526x.c
> @@ -1192,9 +1192,6 @@ static int uli526x_suspend(struct pci_dev *pdev, pm_message_t state)
>
> ULI526X_DBUG(0, "uli526x_suspend", 0);
>
> - if (!netdev_priv(dev))
> - return 0;
> -
> pci_save_state(pdev);
>
> if (!netif_running(dev))
> @@ -1228,9 +1225,6 @@ static int uli526x_resume(struct pci_dev *pdev)
>
> ULI526X_DBUG(0, "uli526x_resume", 0);
>
> - if (!netdev_priv(dev))
> - return 0;
> -
> pci_restore_state(pdev);
>
> if (!netif_running(dev))
>

2014-01-04 00:35:42

by David Miller

Subject: Re: [PATCH] net: tulip: delete useless tests on netdev_priv

From: Grant Grundler <[email protected]>
Date: Thu, 2 Jan 2014 07:57:26 -0800

> On Thu, Jan 2, 2014 at 8:28 AM, Julia Lawall <[email protected]> wrote:
>> From: Julia Lawall <[email protected]>
>>
>> Netdev_priv performs an addition, not a pointer dereference, so it seems
>> quit unlikely that its result would ever be NULL.
>
> LGTM.
>
> >
>> A semantic patch that makes this change is as follows:
>> (http://coccinelle.lip6.fr/)
>>
>> // <smpl>
>> @@
>> statement S;
>> @@
>>
>> - if (!netdev_priv(...)) S
>> // </smpl>
>>
>> Signed-off-by: Julia Lawall <[email protected]>
>
> Acked-by: Grant Grundler <[email protected]>

Applied, thanks everyone.