From: linas@austin.ibm.com (Linas Vepstas)
To: Andrew Morton <akpm@osdl.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
netdev@vger.kernel.org, Christoph Hellwig <hch@infradead.org>,
linuxppc-dev@ozlabs.org, Jens Osterkamp <Jens.Osterkamp@gmx.de>,
jgarzik@pobox.com, James K Lewis <jim@jklewis.com>
Subject: [PATCH 9/14] Spidernet Remove unused variable
Date: Wed, 13 Dec 2006 15:19:54 -0600 [thread overview]
Message-ID: <20061213211954.GI1915@austin.ibm.com> (raw)
In-Reply-To: <20061213210010.GR4329@austin.ibm.com>
Remove unused variable; this makes code easier to read.
Tweak commentary.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
----
drivers/net/spider_net.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
Index: linux-2.6.19-git7/drivers/net/spider_net.c
===================================================================
--- linux-2.6.19-git7.orig/drivers/net/spider_net.c 2006-12-13 14:28:11.000000000 -0600
+++ linux-2.6.19-git7/drivers/net/spider_net.c 2006-12-13 14:28:15.000000000 -0600
@@ -367,21 +367,20 @@ spider_net_free_rx_chain_contents(struct
}
/**
- * spider_net_prepare_rx_descr - reinitializes a rx descriptor
+ * spider_net_prepare_rx_descr - Reinitialize RX descriptor
* @card: card structure
* @descr: descriptor to re-init
*
- * return 0 on succes, <0 on failure
+ * Return 0 on succes, <0 on failure.
*
- * allocates a new rx skb, iommu-maps it and attaches it to the descriptor.
- * Activate the descriptor state-wise
+ * Allocates a new rx skb, iommu-maps it and attaches it to the
+ * descriptor. Mark the descriptor as activated, ready-to-use.
*/
static int
spider_net_prepare_rx_descr(struct spider_net_card *card,
struct spider_net_descr *descr)
{
dma_addr_t buf;
- int error = 0;
int offset;
int bufsize;
@@ -409,7 +408,7 @@ spider_net_prepare_rx_descr(struct spide
(SPIDER_NET_RXBUF_ALIGN - 1);
if (offset)
skb_reserve(descr->skb, SPIDER_NET_RXBUF_ALIGN - offset);
- /* io-mmu-map the skb */
+ /* iommu-map the skb */
buf = pci_map_single(card->pdev, descr->skb->data,
SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE);
descr->buf_addr = buf;
@@ -424,7 +423,7 @@ spider_net_prepare_rx_descr(struct spide
SPIDER_NET_DMAC_NOINTR_COMPLETE;
}
- return error;
+ return 0;
}
/**
next prev parent reply other threads:[~2006-12-13 21:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-13 21:00 [PATCH 0/14]: Spidernet RX-side patches Linas Vepstas
2006-12-13 21:06 ` [PATCH 1/14] Spidernet DMA coalescing Linas Vepstas
2006-12-14 11:05 ` Christoph Hellwig
2006-12-14 17:07 ` Linas Vepstas
2006-12-14 17:35 ` Christoph Hellwig
2006-12-14 19:38 ` Revised: " Linas Vepstas
2006-12-26 21:09 ` Jeff Garzik
2006-12-13 21:08 ` [PATCH 2/14] Spidernet add net_ratelimit to suppress long output Linas Vepstas
2006-12-13 23:31 ` Michael Ellerman
2006-12-14 6:13 ` Jim Lewis
2006-12-13 21:10 ` [PATCH 3/14] Spidernet remove rxramfull tasklet Linas Vepstas
2006-12-13 21:12 ` [PATCH 4/14] Spidernet cleanup un-needed API Linas Vepstas
2006-12-13 21:15 ` [PATCH 5/14] Spidernet RX skb mem leak Linas Vepstas
2006-12-13 21:16 ` [PATCH 6/14] Spidernet another " Linas Vepstas
2006-12-13 21:17 ` [PATCH 7/14] Spidernet Cleanup return codes Linas Vepstas
2006-12-13 21:18 ` [PATCH 8/14] Spidernet RX Refill Linas Vepstas
2006-12-13 21:19 ` Linas Vepstas [this message]
2006-12-13 21:20 ` [PATCH 10/14] Spidernet RX Chain tail Linas Vepstas
2006-12-13 21:22 ` [PATCH 11/14] Spidernet Memory barrier Linas Vepstas
2006-12-13 21:23 ` [PATCH 12/14] Spidernet Avoid possible RX chain corruption Linas Vepstas
2006-12-14 0:22 ` Michael Ellerman
2006-12-14 17:15 ` Linas Vepstas
2006-12-14 17:36 ` Christoph Hellwig
2006-12-15 1:48 ` Michael Ellerman
2006-12-13 21:23 ` [PATCH 13/14] Spidernet RX Debugging printout Linas Vepstas
2006-12-13 21:25 ` [PATCH 14/14] Spidernet Rework RX linked list Linas Vepstas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061213211954.GI1915@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=Jens.Osterkamp@gmx.de \
--cc=akpm@osdl.org \
--cc=arnd@arndb.de \
--cc=hch@infradead.org \
--cc=jgarzik@pobox.com \
--cc=jim@jklewis.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).