aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/niu.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-10-15 04:42:31 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-15 15:26:33 -0400
commita9d41192b96559aa3658bc7886468a46da911c76 (patch)
treec982e08ce454c41482f83fee5537707ee2a3ca51 /drivers/net/niu.c
parentf937f1f46b6d2f9bef94e0d6b769a4c67615d34e (diff)
[NIU]: getting rid of __ucmpdi2 in niu.o
By the time we get to that switch by PHY type, we have 8bit value. No need to keep it in u64 when u8 would do. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r--drivers/net/niu.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 54166bdeae96..ed1f9bbb2a32 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -6123,19 +6123,19 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
6123 val = nr64(ESPC_PHY_TYPE); 6123 val = nr64(ESPC_PHY_TYPE);
6124 switch (np->port) { 6124 switch (np->port) {
6125 case 0: 6125 case 0:
6126 val = (val & ESPC_PHY_TYPE_PORT0) >> 6126 val8 = (val & ESPC_PHY_TYPE_PORT0) >>
6127 ESPC_PHY_TYPE_PORT0_SHIFT; 6127 ESPC_PHY_TYPE_PORT0_SHIFT;
6128 break; 6128 break;
6129 case 1: 6129 case 1:
6130 val = (val & ESPC_PHY_TYPE_PORT1) >> 6130 val8 = (val & ESPC_PHY_TYPE_PORT1) >>
6131 ESPC_PHY_TYPE_PORT1_SHIFT; 6131 ESPC_PHY_TYPE_PORT1_SHIFT;
6132 break; 6132 break;
6133 case 2: 6133 case 2:
6134 val = (val & ESPC_PHY_TYPE_PORT2) >> 6134 val8 = (val & ESPC_PHY_TYPE_PORT2) >>
6135 ESPC_PHY_TYPE_PORT2_SHIFT; 6135 ESPC_PHY_TYPE_PORT2_SHIFT;
6136 break; 6136 break;
6137 case 3: 6137 case 3:
6138 val = (val & ESPC_PHY_TYPE_PORT3) >> 6138 val8 = (val & ESPC_PHY_TYPE_PORT3) >>
6139 ESPC_PHY_TYPE_PORT3_SHIFT; 6139 ESPC_PHY_TYPE_PORT3_SHIFT;
6140 break; 6140 break;
6141 default: 6141 default:
@@ -6143,9 +6143,9 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
6143 np->port); 6143 np->port);
6144 return -EINVAL; 6144 return -EINVAL;
6145 } 6145 }
6146 niudbg(PROBE, "SPROM: PHY type %llx\n", (unsigned long long) val); 6146 niudbg(PROBE, "SPROM: PHY type %x\n", val8);
6147 6147
6148 switch (val) { 6148 switch (val8) {
6149 case ESPC_PHY_TYPE_1G_COPPER: 6149 case ESPC_PHY_TYPE_1G_COPPER:
6150 /* 1G copper, MII */ 6150 /* 1G copper, MII */
6151 np->flags &= ~(NIU_FLAGS_FIBER | 6151 np->flags &= ~(NIU_FLAGS_FIBER |
@@ -6175,8 +6175,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
6175 break; 6175 break;
6176 6176
6177 default: 6177 default:
6178 dev_err(np->device, PFX "Bogus SPROM phy type %llu\n", 6178 dev_err(np->device, PFX "Bogus SPROM phy type %u\n", val8);
6179 (unsigned long long) val);
6180 return -EINVAL; 6179 return -EINVAL;
6181 } 6180 }
6182 6181