2004-10-28 23:12:19

by Adrian Bunk

Subject: [2.6 patch] net/typhoon.c: remove an unused function

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The patch below removes an unused function from drivers/net/typhoon.c


diffstat output:
drivers/net/typhoon.c | 8 --------
1 files changed, 8 deletions(-)


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

- --- linux-2.6.10-rc1-mm1-full/drivers/net/typhoon.c.old 2004-10-28 23:21:30.000000000 +0200
+++ linux-2.6.10-rc1-mm1-full/drivers/net/typhoon.c 2004-10-28 23:21:44.000000000 +0200
@@ -372,14 +372,6 @@
typhoon_inc_index(index, count, TXLO_ENTRIES);
}

- -static inline void
- -typhoon_inc_rx_index(u32 *index, const int count)
- -{
- - /* sizeof(struct rx_desc) != sizeof(struct cmd_desc) */
- - *index += count * sizeof(struct rx_desc);
- - *index %= RX_ENTRIES * sizeof(struct rx_desc);
- -}
- -
static int
typhoon_reset(void __iomem *ioaddr, int wait_type)
{

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQFBgXt1mfzqmE8StAARAkWAAJ0dshTZ/dXqh+UdamvhZCzGA6cqvQCggWQf
JtBs+VjssQpn02lnVV9MhmA=
=6yW2
-----END PGP SIGNATURE-----

2004-10-29 00:13:12

by David Dillow

Subject: Re: [2.6 patch] net/typhoon.c: remove an unused function

On Fri, 2004-10-29 at 01:06 +0200, Adrian Bunk wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> The patch below removes an unused function from drivers/net/typhoon.c

NAK -- I'd prefer to make it be used, which was the reason it was there
in the first place... not sure why it wasn't...

===== drivers/net/typhoon.c 1.25 vs edited =====
--- 1.25/drivers/net/typhoon.c 2004-10-21 18:42:58 -04:00
+++ edited/drivers/net/typhoon.c 2004-10-28 20:06:45 -04:00
@@ -1687,8 +1687,7 @@
skb = rxb->skb;
dma_addr = rxb->dma_addr;

- rxaddr += sizeof(struct rx_desc);
- rxaddr %= RX_ENTRIES * sizeof(struct rx_desc);
+ typhoon_inc_rx_index(&rxaddr, 1);

if(rx->flags & TYPHOON_RX_ERROR) {
typhoon_recycle_rx_skb(tp, idx);