2005-03-22 22:00:11

by Adrian Bunk

Subject: [RFC: 2.6 patch] drivers/net/ns83820.c: remove unused code

The Coveity checker found that residue is always 0.

Is this patch correct or should residue have been used?

Signed-off-by: Adrian Bunk <[email protected]>

--- linux-2.6.12-rc1-mm1-full/drivers/net/ns83820.c.old 2005-03-22 21:32:15.000000000 +0100
+++ linux-2.6.12-rc1-mm1-full/drivers/net/ns83820.c 2005-03-22 21:33:16.000000000 +0100
@@ -1189,7 +1189,6 @@

for (;;) {
volatile u32 *desc = dev->tx_descs + (free_idx * DESC_SIZE);
- u32 residue = 0;

dprintk("frag[%3u]: %4u @ 0x%08Lx\n", free_idx, len,
(unsigned long long)buf);
@@ -1199,17 +1198,11 @@
desc_addr_set(desc + DESC_BUFPTR, buf);
desc[DESC_EXTSTS] = cpu_to_le32(extsts);

- cmdsts = ((nr_frags|residue) ? CMDSTS_MORE : do_intr ? CMDSTS_INTR : 0);
+ cmdsts = ((nr_frags) ? CMDSTS_MORE : do_intr ? CMDSTS_INTR : 0);
cmdsts |= (desc == first_desc) ? 0 : CMDSTS_OWN;
cmdsts |= len;
desc[DESC_CMDSTS] = cpu_to_le32(cmdsts);

- if (residue) {
- buf += len;
- len = residue;
- continue;
- }
-
if (!nr_frags)
break;

2005-04-01 21:20:09

by Benjamin LaHaise

Subject: Re: [RFC: 2.6 patch] drivers/net/ns83820.c: remove unused code

applied

On Tue, Mar 22, 2005 at 10:57:17PM +0100, Adrian Bunk wrote:
> The Coveity checker found that residue is always 0.
>
> Is this patch correct or should residue have been used?
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> --- linux-2.6.12-rc1-mm1-full/drivers/net/ns83820.c.old 2005-03-22 21:32:15.000000000 +0100
> +++ linux-2.6.12-rc1-mm1-full/drivers/net/ns83820.c 2005-03-22 21:33:16.000000000 +0100
> @@ -1189,7 +1189,6 @@
>
> for (;;) {
> volatile u32 *desc = dev->tx_descs + (free_idx * DESC_SIZE);
> - u32 residue = 0;
>
> dprintk("frag[%3u]: %4u @ 0x%08Lx\n", free_idx, len,
> (unsigned long long)buf);
> @@ -1199,17 +1198,11 @@
> desc_addr_set(desc + DESC_BUFPTR, buf);
> desc[DESC_EXTSTS] = cpu_to_le32(extsts);
>
> - cmdsts = ((nr_frags|residue) ? CMDSTS_MORE : do_intr ? CMDSTS_INTR : 0);
> + cmdsts = ((nr_frags) ? CMDSTS_MORE : do_intr ? CMDSTS_INTR : 0);
> cmdsts |= (desc == first_desc) ? 0 : CMDSTS_OWN;
> cmdsts |= len;
> desc[DESC_CMDSTS] = cpu_to_le32(cmdsts);
>
> - if (residue) {
> - buf += len;
> - len = residue;
> - continue;
> - }
> -
> if (!nr_frags)
> break;
>
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-ns83820' in
> the body to [email protected].

--
"Time is what keeps everything from happening all at once." -- John Wheeler