]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: remove unnecessary check for NULL pointer
authorBruce Allan <bruce.w.allan@intel.com>
Fri, 22 Jul 2011 06:21:41 +0000 (06:21 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 2 Feb 2012 13:19:03 +0000 (21:19 +0800)
The array shadow_ram is never NULL.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit b9e06f70dc186f8353cc593f2b4609383b3be7a9)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000e/ich8lan.c

index d08dc966becd977c0e68b82b9fca9578e4c18cd2..cda1b37fc068874c3b665131a2388d495596a620 100644 (file)
@@ -2146,8 +2146,7 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words,
 
        ret_val = 0;
        for (i = 0; i < words; i++) {
-               if ((dev_spec->shadow_ram) &&
-                   (dev_spec->shadow_ram[offset+i].modified)) {
+               if (dev_spec->shadow_ram[offset+i].modified) {
                        data[i] = dev_spec->shadow_ram[offset+i].value;
                } else {
                        ret_val = e1000_read_flash_word_ich8lan(hw,