* [PATCH] net: pegasus: remove unused variables and labels
@ 2016-05-20 8:22 Arnd Bergmann
2016-05-20 9:32 ` Petko Manolov
2016-05-20 16:40 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-05-20 8:22 UTC (permalink / raw)
To: Petko Manolov
Cc: Arnd Bergmann, David S. Miller, xypron.glpk@gmx.de, linux-usb,
netdev, linux-kernel
The latest dead-code removal was slightly incomplete and
left a few things behind that we now get compiler warnings
for:
drivers/net/usb/pegasus.c: In function 'read_bulk_callback':
drivers/net/usb/pegasus.c:475:1: error: label 'goon' defined but not used [-Werror=unused-label]
drivers/net/usb/pegasus.c:446:8: error: unused variable 'pkt_len' [-Werror=unused-variable]
drivers/net/usb/pegasus.c:445:6: error: unused variable 'buf' [-Werror=unused-variable]
drivers/net/usb/pegasus.c:443:17: error: unused variable 'count' [-Werror=unused-variable]
This removes them as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: e00be9e4d0ff ("net: pegasus: remove dead coding")
---
drivers/net/usb/pegasus.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 1903d2e2b62d..df6d90ab7ca7 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -440,10 +440,8 @@ static void read_bulk_callback(struct urb *urb)
{
pegasus_t *pegasus = urb->context;
struct net_device *net;
- int rx_status, count = urb->actual_length;
+ int rx_status;
int status = urb->status;
- u8 *buf = urb->transfer_buffer;
- __u16 pkt_len;
if (!pegasus)
return;
@@ -472,7 +470,6 @@ static void read_bulk_callback(struct urb *urb)
netif_dbg(pegasus, rx_err, net, "RX status %d\n", status);
}
-goon:
usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
usb_rcvbulkpipe(pegasus->usb, 1),
pegasus->rx_skb->data, PEGASUS_MTU,
--
2.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] net: pegasus: remove unused variables and labels
2016-05-20 8:22 [PATCH] net: pegasus: remove unused variables and labels Arnd Bergmann
@ 2016-05-20 9:32 ` Petko Manolov
2016-05-20 9:58 ` Arnd Bergmann
2016-05-20 16:40 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Petko Manolov @ 2016-05-20 9:32 UTC (permalink / raw)
To: Arnd Bergmann
Cc: David S. Miller, xypron.glpk@gmx.de, linux-usb, netdev,
linux-kernel, oneukum, linux
Guys, come on. This code is not dead. This code is executed every time an
ethernet packet is received. It takes care of various error statistics. More
importantly, it sends the actual (reported by the adapter) packet length to the
network layer along with the packet.
This patch removes skb_put() and netif_rx() calls and effectively kills the RX
path. Not to mention that the driver was not even compiled before sending the
patch upstream.
The only sensible, although cosmetic, change would be to replace:
if (!count || count < 4)
with
if (count < 4)
even though GCC takes care and it optimizes away "!count" condition.
Please revert this patch before Linus pulls from the network tree.
Petko
On 16-05-20 10:22:30, Arnd Bergmann wrote:
> The latest dead-code removal was slightly incomplete and
> left a few things behind that we now get compiler warnings
> for:
>
> drivers/net/usb/pegasus.c: In function 'read_bulk_callback':
> drivers/net/usb/pegasus.c:475:1: error: label 'goon' defined but not used [-Werror=unused-label]
> drivers/net/usb/pegasus.c:446:8: error: unused variable 'pkt_len' [-Werror=unused-variable]
> drivers/net/usb/pegasus.c:445:6: error: unused variable 'buf' [-Werror=unused-variable]
> drivers/net/usb/pegasus.c:443:17: error: unused variable 'count' [-Werror=unused-variable]
>
> This removes them as well.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: e00be9e4d0ff ("net: pegasus: remove dead coding")
> ---
> drivers/net/usb/pegasus.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
> index 1903d2e2b62d..df6d90ab7ca7 100644
> --- a/drivers/net/usb/pegasus.c
> +++ b/drivers/net/usb/pegasus.c
> @@ -440,10 +440,8 @@ static void read_bulk_callback(struct urb *urb)
> {
> pegasus_t *pegasus = urb->context;
> struct net_device *net;
> - int rx_status, count = urb->actual_length;
> + int rx_status;
> int status = urb->status;
> - u8 *buf = urb->transfer_buffer;
> - __u16 pkt_len;
>
> if (!pegasus)
> return;
> @@ -472,7 +470,6 @@ static void read_bulk_callback(struct urb *urb)
> netif_dbg(pegasus, rx_err, net, "RX status %d\n", status);
> }
>
> -goon:
> usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb,
> usb_rcvbulkpipe(pegasus->usb, 1),
> pegasus->rx_skb->data, PEGASUS_MTU,
> --
> 2.7.0
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] net: pegasus: remove unused variables and labels
2016-05-20 9:32 ` Petko Manolov
@ 2016-05-20 9:58 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-05-20 9:58 UTC (permalink / raw)
To: Petko Manolov
Cc: David S. Miller, xypron.glpk@gmx.de, linux-usb, netdev,
linux-kernel, oneukum, linux
On Friday 20 May 2016 12:32:23 Petko Manolov wrote:
> Guys, come on. This code is not dead. This code is executed every time an
> ethernet packet is received. It takes care of various error statistics. More
> importantly, it sends the actual (reported by the adapter) packet length to the
> network layer along with the packet.
>
> This patch removes skb_put() and netif_rx() calls and effectively kills the RX
> path. Not to mention that the driver was not even compiled before sending the
> patch upstream.
>
> The only sensible, although cosmetic, change would be to replace:
>
> if (!count || count < 4)
>
> with
>
> if (count < 4)
>
> even though GCC takes care and it optimizes away "!count" condition.
>
> Please revert this patch before Linus pulls from the network tree.
>
Agreed. I failed to check the commit that introduced the warning for
the more serious problem.
Please revert e00be9e4d0ff, it just makes no sense.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: pegasus: remove unused variables and labels
2016-05-20 8:22 [PATCH] net: pegasus: remove unused variables and labels Arnd Bergmann
2016-05-20 9:32 ` Petko Manolov
@ 2016-05-20 16:40 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2016-05-20 16:40 UTC (permalink / raw)
To: arnd; +Cc: petkan, xypron.glpk, linux-usb, netdev, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 20 May 2016 10:22:30 +0200
> The latest dead-code removal was slightly incomplete and
> left a few things behind that we now get compiler warnings
> for:
>
> drivers/net/usb/pegasus.c: In function 'read_bulk_callback':
> drivers/net/usb/pegasus.c:475:1: error: label 'goon' defined but not used [-Werror=unused-label]
> drivers/net/usb/pegasus.c:446:8: error: unused variable 'pkt_len' [-Werror=unused-variable]
> drivers/net/usb/pegasus.c:445:6: error: unused variable 'buf' [-Werror=unused-variable]
> drivers/net/usb/pegasus.c:443:17: error: unused variable 'count' [-Werror=unused-variable]
>
> This removes them as well.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: e00be9e4d0ff ("net: pegasus: remove dead coding")
The patch in question was broken and has been reverted.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-20 16:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-20 8:22 [PATCH] net: pegasus: remove unused variables and labels Arnd Bergmann
2016-05-20 9:32 ` Petko Manolov
2016-05-20 9:58 ` Arnd Bergmann
2016-05-20 16:40 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).