From: linas@austin.ibm.com (Linas Vepstas)
To: Andrew Morton <akpm@osdl.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
netdev@vger.kernel.org, James K Lewis <jklewis@us.ibm.com>,
linuxppc-dev@ozlabs.org, jgarzik@pobox.com
Subject: [PATCH 10/16] Spidernet Remove unused variable
Date: Wed, 6 Dec 2006 17:41:18 -0600 [thread overview]
Message-ID: <20061206234117.GJ4649@austin.ibm.com> (raw)
In-Reply-To: <20061206223223.GH17931@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 | 11 +++++------
1 file changed, 5 insertions(+), 6 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-06 16:03:09.000000000 -0600
+++ linux-2.6.19-git7/drivers/net/spider_net.c 2006-12-06 16:03:11.000000000 -0600
@@ -341,17 +341,16 @@ spider_net_free_rx_chain_contents(struct
* @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;
@@ -379,7 +378,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;
@@ -394,7 +393,7 @@ spider_net_prepare_rx_descr(struct spide
SPIDER_NET_DMAC_NOINTR_COMPLETE;
}
- return error;
+ return 0;
}
/**
WARNING: multiple messages have this Message-ID (diff)
From: linas@austin.ibm.com (Linas Vepstas)
To: Andrew Morton <akpm@osdl.org>
Cc: jgarzik@pobox.com, netdev@vger.kernel.org,
linuxppc-dev@ozlabs.org, James K Lewis <jklewis@us.ibm.com>,
Arnd Bergmann <arnd@arndb.de>,
Geoff Levand <geoffrey.levand@am.sony.com>
Subject: [PATCH 10/16] Spidernet Remove unused variable
Date: Wed, 6 Dec 2006 17:41:18 -0600 [thread overview]
Message-ID: <20061206234117.GJ4649@austin.ibm.com> (raw)
In-Reply-To: <20061206223223.GH17931@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 | 11 +++++------
1 file changed, 5 insertions(+), 6 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-06 16:03:09.000000000 -0600
+++ linux-2.6.19-git7/drivers/net/spider_net.c 2006-12-06 16:03:11.000000000 -0600
@@ -341,17 +341,16 @@ spider_net_free_rx_chain_contents(struct
* @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;
@@ -379,7 +378,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;
@@ -394,7 +393,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-06 23:41 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-06 22:32 [PATCH 0/16] Spidernet RX Misc cleanups and fixes Linas Vepstas
2006-12-06 22:32 ` Linas Vepstas
2006-12-06 23:27 ` [PATCH 1/16] Spidernet DMA coalescing Linas Vepstas
2006-12-06 23:27 ` Linas Vepstas
2006-12-07 7:08 ` Andrew Morton
2006-12-07 7:08 ` Andrew Morton
2006-12-07 17:16 ` Linas Vepstas
2006-12-08 2:12 ` Mail forwarding loop (was: Re: [PATCH 1/16] Spidernet DMA coalescing) Stephen Rothwell
2006-12-07 10:11 ` [PATCH 1/16] Spidernet DMA coalescing Christoph Hellwig
2006-12-07 10:11 ` Christoph Hellwig
2006-12-13 17:27 ` Linas Vepstas
2006-12-13 17:27 ` Linas Vepstas
2006-12-06 23:29 ` [PATCH 2/16] Spidernet add net_ratelimit to suppress long output Linas Vepstas
2006-12-06 23:29 ` Linas Vepstas
2006-12-06 23:31 ` [PATCH 3/16] Spidernet RX Locking Linas Vepstas
2006-12-06 23:31 ` Linas Vepstas
2006-12-07 10:09 ` Jeff Garzik
2006-12-07 10:09 ` Jeff Garzik
2006-12-07 17:50 ` Linas Vepstas
2006-12-07 17:50 ` Linas Vepstas
2006-12-08 22:47 ` Benjamin Herrenschmidt
2006-12-08 22:47 ` Benjamin Herrenschmidt
2006-12-11 21:07 ` Linas Vepstas
2006-12-11 21:07 ` Linas Vepstas
2006-12-06 23:33 ` [PATCH 4/16] Spidernet Refactor RX refill Linas Vepstas
2006-12-06 23:33 ` Linas Vepstas
2006-12-06 23:34 ` [PATCH 5/16] Spidernet RX skb mem leak Linas Vepstas
2006-12-06 23:34 ` Linas Vepstas
2006-12-06 23:36 ` [PATCH 6/16] Spidernet another " Linas Vepstas
2006-12-06 23:36 ` Linas Vepstas
2006-12-06 23:37 ` [PATCH 7/16] Spidernet Cleanup return codes Linas Vepstas
2006-12-06 23:37 ` Linas Vepstas
2006-12-06 23:39 ` [PATCH 8/16] Spidernet RX Refill Linas Vepstas
2006-12-06 23:39 ` Linas Vepstas
2006-12-06 23:40 ` [PATCH 9/16] Spidernet Merge error branches Linas Vepstas
2006-12-06 23:40 ` Linas Vepstas
2006-12-06 23:41 ` Linas Vepstas [this message]
2006-12-06 23:41 ` [PATCH 10/16] Spidernet Remove unused variable Linas Vepstas
2006-12-06 23:42 ` [PATCH 11/16] Spidernet RX Chain tail Linas Vepstas
2006-12-06 23:42 ` Linas Vepstas
2006-12-06 23:43 ` [PATCH 12/16] Spidernet Turn RX irq back on Linas Vepstas
2006-12-06 23:45 ` [PATCH 13/16] Spidernet Memory barrier Linas Vepstas
2006-12-06 23:45 ` Linas Vepstas
2006-12-06 23:46 ` [PATCH 14/16] Spidernet Avoid possible RX chain corruption Linas Vepstas
2006-12-06 23:46 ` Linas Vepstas
2006-12-06 23:49 ` [PATCH 15/16] Spidernet RX Debugging printout Linas Vepstas
2006-12-06 23:49 ` Linas Vepstas
2006-12-06 23:51 ` [PATCH 16/16] Spidernet Rework RX linked list Linas Vepstas
2006-12-06 23:51 ` 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=20061206234117.GJ4649@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=akpm@osdl.org \
--cc=arnd@arndb.de \
--cc=jgarzik@pobox.com \
--cc=jklewis@us.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.