diff options
author | Joe Perches <joe@perches.com> | 2012-06-04 08:44:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-06 12:31:33 -0400 |
commit | 6469933605a3ecdfa66b98160cde98ecd256cb3f (patch) | |
tree | 9d80273c26cbec4b3064eee47ba173be11ac444f /drivers/net/ethernet/sgi/ioc3-eth.c | |
parent | 20d5ec435c5fba8142eb7df692a5f54fbb26e892 (diff) |
ethernet: Remove casts to same type
Adding casts of objects to the same type is unnecessary
and confusing for a human reader.
For example, this cast:
int y;
int *p = (int *)&y;
I used the coccinelle script below to find and remove these
unnecessary casts. I manually removed the conversions this
script produces of casts with __force, __iomem and __user.
@@
type T;
T *p;
@@
- (T *)p
+ p
A function in atl1e_main.c was passed a const pointer
when it actually modified elements of the structure.
Change the argument to a non-const pointer.
A function in stmmac needed a __force to avoid a sparse
warning. Added it.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sgi/ioc3-eth.c')
-rw-r--r-- | drivers/net/ethernet/sgi/ioc3-eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index ac149d99f78f..b5ba3084c7fc 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c | |||
@@ -583,7 +583,7 @@ static inline void ioc3_rx(struct net_device *dev) | |||
583 | unsigned long *rxr; | 583 | unsigned long *rxr; |
584 | u32 w0, err; | 584 | u32 w0, err; |
585 | 585 | ||
586 | rxr = (unsigned long *) ip->rxr; /* Ring base */ | 586 | rxr = ip->rxr; /* Ring base */ |
587 | rx_entry = ip->rx_ci; /* RX consume index */ | 587 | rx_entry = ip->rx_ci; /* RX consume index */ |
588 | n_entry = ip->rx_pi; | 588 | n_entry = ip->rx_pi; |
589 | 589 | ||
@@ -903,7 +903,7 @@ static void ioc3_alloc_rings(struct net_device *dev) | |||
903 | if (ip->rxr == NULL) { | 903 | if (ip->rxr == NULL) { |
904 | /* Allocate and initialize rx ring. 4kb = 512 entries */ | 904 | /* Allocate and initialize rx ring. 4kb = 512 entries */ |
905 | ip->rxr = (unsigned long *) get_zeroed_page(GFP_ATOMIC); | 905 | ip->rxr = (unsigned long *) get_zeroed_page(GFP_ATOMIC); |
906 | rxr = (unsigned long *) ip->rxr; | 906 | rxr = ip->rxr; |
907 | if (!rxr) | 907 | if (!rxr) |
908 | printk("ioc3_alloc_rings(): get_zeroed_page() failed!\n"); | 908 | printk("ioc3_alloc_rings(): get_zeroed_page() failed!\n"); |
909 | 909 | ||