aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/ich8lan.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2010-12-11 00:53:47 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2010-12-25 00:31:49 -0500
commitb1cdfead0e532d7614b5d5b97044df94cc8945ae (patch)
tree921241c8bac9f03705965a82daf3256cc8033d8d /drivers/net/e1000e/ich8lan.c
parent6480641eb741cabbba8e196d4f17db7fb80d101c (diff)
e1000e: checkpatch warnings - braces
WARNING: braces {} are not necessary for any arm of this statement WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Emil Tantilov <emil.s.tantilov@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/e1000e/ich8lan.c')
-rw-r--r--drivers/net/e1000e/ich8lan.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 5080372b0fd..d86cc083272 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -2309,11 +2309,10 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
2309 */ 2309 */
2310 if (ret_val == 0) { 2310 if (ret_val == 0) {
2311 flash_data = er32flash(ICH_FLASH_FDATA0); 2311 flash_data = er32flash(ICH_FLASH_FDATA0);
2312 if (size == 1) { 2312 if (size == 1)
2313 *data = (u8)(flash_data & 0x000000FF); 2313 *data = (u8)(flash_data & 0x000000FF);
2314 } else if (size == 2) { 2314 else if (size == 2)
2315 *data = (u16)(flash_data & 0x0000FFFF); 2315 *data = (u16)(flash_data & 0x0000FFFF);
2316 }
2317 break; 2316 break;
2318 } else { 2317 } else {
2319 /* 2318 /*