vmxnet3: make bit twiddle routines inline
Subsystems (3)
PATCH 1/1 vmxnet3: make bit twiddle routines inline
Gcc doesn't usually handle inline across compilation units, and the functions don't have to be global in scope. Move the set/reset flag functions int the existing vmxnet3 header.
--- drivers/net/vmxnet3/vmxnet3_drv.c | 17 ----------------- drivers/net/vmxnet3/vmxnet3_int.h | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 20 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +0 -17
@@ -1548,23 +1548,6 @@ vmxnet3_free_irqs(struct vmxnet3_adapter } } - -inline void set_flag_le16 (__le16 *data,u16 flag) -{ - *data =cpu_to_le16 (le16_to_cpu (*data) | flag); -} - -inline void set_flag_le64 (__le64 *data,u64 flag) -{ - *data =cpu_to_le64 (le64_to_cpu (*data) | flag); -} - -inline void reset_flag_le64 (__le64 *data,u64 flag) -{ - *data =cpu_to_le64 (le64_to_cpu (*data) & ~flag); -} - -static void vmxnet3_vlan_rx_register (struct net_device *netdev,struct vlan_group *grp) {
drivers/net/vmxnet3/vmxnet3_int.h +14 -3
@@ -353,9 +353,20 @@ struct vmxnet3_adapter {#define VMXNET3_MAX_ETH_HDR_SIZE 22#define VMXNET3_MAX_SKB_BUF_SIZE (3*1024) -void set_flag_le16 (__le16 *data,u16 flag); -void set_flag_le64 (__le64 *data,u64 flag); -void reset_flag_le64 (__le64 *data,u64 flag); +static inline void set_flag_le16 (__le16 *data,u16 flag) +{ + *data =cpu_to_le16 (le16_to_cpu (*data) | flag); +} + +static inline void set_flag_le64 (__le64 *data,u64 flag) +{ + *data =cpu_to_le64 (le64_to_cpu (*data) | flag); +} + +static inline void reset_flag_le64 (__le64 *data,u64 flag) +{ + *data =cpu_to_le64 (le64_to_cpu (*data) & ~flag); +}int vmxnet3_quiesce_dev (struct vmxnet3_adapter *adapter);
Thanks for the change Stephen. Looks good.
Quoted 75 lines
-----Original Message-----
From: Stephen Hemminger [mailto:[email protected]]
Sent: Friday, October 15, 2010 2:06 PM
To: Shreyas Bhatewara; David S. Miller
Cc: VMware, Inc.; [email protected]
Subject: [PATCH net-next] vmxnet3: make bit twiddle routines inlineGcc doesn't usually handle inline across compilation units, and the functions don't have to be global in scope. Move the set/reset flag functions int the existing vmxnet3 header.
Signed-off-by Stephen Hemminger <[email protected]>--- drivers/net/vmxnet3/vmxnet3_drv.c | 17 ----------------- drivers/net/vmxnet3/vmxnet3_int.h | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 20 deletions(-)---
a/drivers/net/vmxnet3/vmxnet3_drv.c2010-10-15 13:58:23.378722695
-0700
+++b/drivers/net/vmxnet3/vmxnet3_drv.c2010-10-15 13:59:32.724873755
-0700drivers/net/vmxnet3/vmxnet3_drv.c +0
-17@@ -1548,23 +1548,6 @@ vmxnet3_free_irqs(struct vmxnet3_adapter } } - -inline void set_flag_le16 (__le16 *data,u16 flag) -{ - *data =cpu_to_le16 (le16_to_cpu (*data) | flag); -} - -inline void set_flag_le64 (__le64 *data,u64 flag) -{ - *data =cpu_to_le64 (le64_to_cpu (*data) | flag); -} - -inline void reset_flag_le64 (__le64 *data,u64 flag) -{ - *data =cpu_to_le64 (le64_to_cpu (*data) & ~flag); -} - -static void vmxnet3_vlan_rx_register (struct net_device *netdev,struct vlan_group *grp){
---a/drivers/net/vmxnet3/vmxnet3_int.h2010-10-15 13:58:23.390723065
-0700
+++b/drivers/net/vmxnet3/vmxnet3_int.h2010-10-15 13:59:46.329296549
-0700drivers/net/vmxnet3/vmxnet3_int.h +14
-3@@ -353,9 +353,20 @@ struct vmxnet3_adapter {#define VMXNET3_MAX_ETH_HDR_SIZE 22#define VMXNET3_MAX_SKB_BUF_SIZE (3*1024) -void set_flag_le16 (__le16 *data,u16 flag); -void set_flag_le64 (__le64 *data,u64 flag); -void reset_flag_le64 (__le64 *data,u64 flag); +static inline void set_flag_le16 (__le16 *data,u16 flag) +{ + *data =cpu_to_le16 (le16_to_cpu (*data) | flag); +} + +static inline void set_flag_le64 (__le64 *data,u64 flag) +{ + *data =cpu_to_le64 (le64_to_cpu (*data) | flag); +} + +static inline void reset_flag_le64 (__le64 *data,u64 flag) +{ + *data =cpu_to_le64 (le64_to_cpu (*data) & ~flag); +}int vmxnet3_quiesce_dev (struct vmxnet3_adapter *adapter);
drivers/net/vmxnet3/vmxnet3_int.h struct vmxnet3_adapter { · line 360
Quoted 5 lines · Stephen Hemminger
drivers/net/vmxnet3/vmxnet3_int.h +5
-0+static inline void set_flag_le16 (__le16 *data,u16 flag) +{ + *data = cpu_to_le16(le16_to_cpu(*data) | flag); +} +
Instead of swapping twice on BE machines, why not:
*data |= cpu_to_le16(flag);
Which may even get done away with at compile time if flag is a constant.
Similarly for the others.
Cheers,
Harvey
From: Stephen Hemminger <[email protected]>
Date: Fri, 15 Oct 2010 14:06:20 -0700
Quoted 5 lines
Gcc doesn't usually handle inline across compilation units, and the functions don't have to be global in scope. Move the set/reset flag functions int the existing vmxnet3 header.
Signed-off-by Stephen Hemminger <[email protected]>
Applied.