diff options
author | Masakazu Mokuno <mokuno@sm.sony.co.jp> | 2007-07-20 04:22:51 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-24 16:28:39 -0400 |
commit | ea6992aa1f6ed514fe450f46befa56d8d2b6a7fb (patch) | |
tree | f2043b39f2eb517a25282e5cc727c82132359c6a /drivers | |
parent | 9f6c9a8c50bc84ec748fec779ead321ee2b2debc (diff) |
ps3: some minor cleanups
- Removed the embarrassing definition which was used in only one
place.
- Fixed wrong initialization of dmac_cmd_status.
Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ps3_gelic_net.c | 5 | ||||
-rw-r--r-- | drivers/net/ps3_gelic_net.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 676a89df4d70..f0610fba4c95 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -290,7 +290,8 @@ static void gelic_net_release_rx_chain(struct gelic_net_card *card) | |||
290 | descr->buf_addr = 0; | 290 | descr->buf_addr = 0; |
291 | dev_kfree_skb_any(descr->skb); | 291 | dev_kfree_skb_any(descr->skb); |
292 | descr->skb = NULL; | 292 | descr->skb = NULL; |
293 | descr->dmac_cmd_status = GELIC_NET_DESCR_NOT_IN_USE; | 293 | gelic_net_set_descr_status(descr, |
294 | GELIC_NET_DESCR_NOT_IN_USE); | ||
294 | } | 295 | } |
295 | descr = descr->next; | 296 | descr = descr->next; |
296 | } while (descr != card->rx_chain.head); | 297 | } while (descr != card->rx_chain.head); |
@@ -374,7 +375,7 @@ static void gelic_net_release_tx_descr(struct gelic_net_card *card, | |||
374 | descr->skb = NULL; | 375 | descr->skb = NULL; |
375 | 376 | ||
376 | /* set descr status */ | 377 | /* set descr status */ |
377 | descr->dmac_cmd_status = GELIC_NET_DMAC_CMDSTAT_NOT_IN_USE; | 378 | gelic_net_set_descr_status(descr, GELIC_NET_DESCR_NOT_IN_USE); |
378 | } | 379 | } |
379 | 380 | ||
380 | /** | 381 | /** |
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h index 5e1c28654e16..83ccfd9f975c 100644 --- a/drivers/net/ps3_gelic_net.h +++ b/drivers/net/ps3_gelic_net.h | |||
@@ -133,7 +133,6 @@ enum gelic_net_int1_status { | |||
133 | * interrupt status */ | 133 | * interrupt status */ |
134 | 134 | ||
135 | #define GELIC_NET_DMAC_CMDSTAT_CHAIN_END 0x00000002 /* RXDCEIS:DMA stopped */ | 135 | #define GELIC_NET_DMAC_CMDSTAT_CHAIN_END 0x00000002 /* RXDCEIS:DMA stopped */ |
136 | #define GELIC_NET_DMAC_CMDSTAT_NOT_IN_USE 0xb0000000 | ||
137 | #define GELIC_NET_DESCR_IND_PROC_SHIFT 28 | 136 | #define GELIC_NET_DESCR_IND_PROC_SHIFT 28 |
138 | #define GELIC_NET_DESCR_IND_PROC_MASKO 0x0fffffff | 137 | #define GELIC_NET_DESCR_IND_PROC_MASKO 0x0fffffff |
139 | 138 | ||