diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-05 13:54:04 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-05 13:54:04 -0500 |
commit | 0beaca2ca0b3c12dabab046f1541b09179ec449c (patch) | |
tree | 2a8bb2b0decadce4130d91760c54cfbeca8be941 /drivers/net/ethernet/sfc | |
parent | e9e01846c7e18a3b5682b54e50f1005949737bd9 (diff) |
sfc: Remove parentheses around return expressions, reported by checkpatch
Fix the following error:
ERROR: return is not a function, parentheses are not required
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc')
-rw-r--r-- | drivers/net/ethernet/sfc/rx.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index aca349861767..3572c34a79fb 100644 --- a/drivers/net/ethernet/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c | |||
@@ -98,8 +98,8 @@ static inline unsigned int efx_rx_buf_offset(struct efx_nic *efx, | |||
98 | /* Offset is always within one page, so we don't need to consider | 98 | /* Offset is always within one page, so we don't need to consider |
99 | * the page order. | 99 | * the page order. |
100 | */ | 100 | */ |
101 | return (((__force unsigned long) buf->dma_addr & (PAGE_SIZE - 1)) + | 101 | return ((__force unsigned long) buf->dma_addr & (PAGE_SIZE - 1)) + |
102 | efx->type->rx_buffer_hash_size); | 102 | efx->type->rx_buffer_hash_size; |
103 | } | 103 | } |
104 | static inline unsigned int efx_rx_buf_size(struct efx_nic *efx) | 104 | static inline unsigned int efx_rx_buf_size(struct efx_nic *efx) |
105 | { | 105 | { |
@@ -111,8 +111,7 @@ static u8 *efx_rx_buf_eh(struct efx_nic *efx, struct efx_rx_buffer *buf) | |||
111 | if (buf->is_page) | 111 | if (buf->is_page) |
112 | return page_address(buf->u.page) + efx_rx_buf_offset(efx, buf); | 112 | return page_address(buf->u.page) + efx_rx_buf_offset(efx, buf); |
113 | else | 113 | else |
114 | return ((u8 *)buf->u.skb->data + | 114 | return (u8 *)buf->u.skb->data + efx->type->rx_buffer_hash_size; |
115 | efx->type->rx_buffer_hash_size); | ||
116 | } | 115 | } |
117 | 116 | ||
118 | static inline u32 efx_rx_buf_hash(const u8 *eh) | 117 | static inline u32 efx_rx_buf_hash(const u8 *eh) |
@@ -122,10 +121,10 @@ static inline u32 efx_rx_buf_hash(const u8 *eh) | |||
122 | return __le32_to_cpup((const __le32 *)(eh - 4)); | 121 | return __le32_to_cpup((const __le32 *)(eh - 4)); |
123 | #else | 122 | #else |
124 | const u8 *data = eh - 4; | 123 | const u8 *data = eh - 4; |
125 | return ((u32)data[0] | | 124 | return (u32)data[0] | |
126 | (u32)data[1] << 8 | | 125 | (u32)data[1] << 8 | |
127 | (u32)data[2] << 16 | | 126 | (u32)data[2] << 16 | |
128 | (u32)data[3] << 24); | 127 | (u32)data[3] << 24; |
129 | #endif | 128 | #endif |
130 | } | 129 | } |
131 | 130 | ||