]> www.infradead.org Git - users/jedix/linux-maple.git/commit
ixgbe: Remove second instance of lan_id variable
authorDon Skidmore <donald.c.skidmore@intel.com>
Fri, 19 Jun 2015 16:23:36 +0000 (12:23 -0400)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Mon, 12 Oct 2015 16:04:59 +0000 (09:04 -0700)
commit1b54f357a70f4a1ad2b2161468173fc11d7eacdd
tree59be89d5bd630b1e5e582af34c333f48f71c696a
parentbe7fc1eb75b5ae2e47dbe4653838c92dc6444dac
ixgbe: Remove second instance of lan_id variable

Orabug: 21918732

This patch removes the redundant lan_id in the phy struct and uses
the bus version.  Both variables exist and intend to represent the
STATUS register LAN_ID field.  However, phy.lan_id is not bit shifted
so the phy.lan_id = 0x0 for LAN Id 0 and phy.lan_id = 0x4 for LAN Id 1.
Where bus.lan_id is bit shifted so bus.lan_id = 0x0 for LAN Id 0 and
bus.lan_id = 0x1 for LAN Id 1. There seems no need for the additional
lan_id variable and this should make the code less confusing.

Signed-off-by: Donald C Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit d5702dea43fc517c389f2d9825213dabbfdaed5e)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h