[PATCH] s2io: Remove unnecessary casts
Subsystems:
networking drivers , the rest
6203d
4 messages,
2 authors,
2009-08-14 · open the first message on its own page
No need to cast kmalloc.
Signed-off-by: Davidlohr Bueso <redacted>
---
drivers/net/s2io.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 458daa0..43a5abf 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c @@ -870,8 +870,7 @@ 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,8 +880,7 @@ 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
From: Davidlohr Bueso <redacted>
Date: Thu, 13 Aug 2009 22:03:28 -0400
No need to cast kmalloc.
Signed-off-by: Davidlohr Bueso <redacted>
Yeah but:
- ba->ba_0_org = (void *) kmalloc
- (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
+ ba->ba_0_org = kmalloc(BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
Now the code line extends way over 80 columns.
Please fix this up and resubmit.
On Thu, Aug 13, 2009 at 08:14:52PM -0700, David Miller wrote: From: Davidlohr Bueso <redacted>
Date: Thu, 13 Aug 2009 22:03:28 -0400
quoted
No need to cast kmalloc.
Signed-off-by: Davidlohr Bueso <redacted>
Yeah but:
quoted
- ba->ba_0_org = (void *) kmalloc
- (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
+ ba->ba_0_org = kmalloc(BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
Now the code line extends way over 80 columns. Ok, resubmitting and verified by checkpatch.pl
Thanks.
Signed-off-by: Davidlohr Bueso <redacted>
---
drivers/net/s2io.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 458daa0..2bc62d3 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c @@ -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,8 +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
From: Davidlohr Bueso <redacted>
Date: Thu, 13 Aug 2009 23:57:33 -0400
Ok, resubmitting and verified by checkpatch.pl
Thanks.
Signed-off-by: Davidlohr Bueso <redacted>
Your email client has corrupted the patch, turning tab
characters into spaces and whatnot.
Please correct this and make a fresh, formal, resubmission
(fresh subject, commit message, and all).
Thank you.