Skip to contentSkip to conversation

s2io: Remove unnecessary casts

PATCH RESEND In review Davidlohr Bueso 2 participants 2 messages Sep 8, 2009 – Sep 9, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 s2io: Remove unnecessary casts

Hi David,

Don't know why my email client corrupted the patch, anyways, here it is without white spaces.

No need to cast kmalloc.

Thanks,
Davidlohr

---
 drivers/net/s2io.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/s2io.c +4 -2
index 458daa0..2bc62d3 100644
@@ -870,8 +870,10 @@ static int init_shared_mem(struct s2io_nic *nic)
 				while (k != rxd_count[nic->rxd_mode]) {
 					ba = &mac_control->rings[i].ba[j][k];
 
-					ba->ba_0_org = (void *) kmalloc
-					    (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
+					ba->ba_0_org = kmalloc
+						(BUF0_LEN + ALIGN_SIZE,
+						 GFP_KERNEL);
+
 					if (!ba->ba_0_org)
 						return -ENOMEM;
 					mem_allocated +@@ -881,9 +883,10 @@ static int init_shared_mem(struct s2io_nic *nic)

tmp &= ~((unsigned long) ALIGN_SIZE); ba->ba_0 = (void *) tmp;

- ba->ba_1_org = (void *) kmalloc
- (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
+ ba->ba_1_org = kmalloc
+ (BUF1_LEN + ALIGN_SIZE,
+ GFP_KERNEL);
+
if (!ba->ba_1_org)
return -ENOMEM;
mem_allocated
--
1.6.0.4

maintainer
#1 lore raw

From: Davidlohr Bueso <[email protected]>
Date: Tue, 08 Sep 2009 00:26:55 -0400

Quoted 11 lines

Hi David,

Don't know why my email client corrupted the patch, anyways, here it is without white spaces.

No need to cast kmalloc.

Thanks,
Davidlohr

Since you last submitted this patch a large series of cleanup patches were added to this driver in the net-next-2.6 tree and as a result your patch no longer applies properly.

You'll need to respin these changes and make sure they apply cleanly to net-next-2.6

Thanks.