]> err.no Git - linux-2.6/commitdiff
[NIU]: getting rid of __ucmpdi2 in niu.o
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 15 Oct 2007 08:42:31 +0000 (01:42 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 15 Oct 2007 19:26:33 +0000 (12:26 -0700)
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>
drivers/net/niu.c

index 54166bdeae96b69265521a4567e1ab6fd2001b91..ed1f9bbb2a32e5265e13cca49b46e807b32e9c69 100644 (file)
@@ -6123,19 +6123,19 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
        val = nr64(ESPC_PHY_TYPE);
        switch (np->port) {
        case 0:
-               val = (val & ESPC_PHY_TYPE_PORT0) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT0) >>
                        ESPC_PHY_TYPE_PORT0_SHIFT;
                break;
        case 1:
-               val = (val & ESPC_PHY_TYPE_PORT1) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT1) >>
                        ESPC_PHY_TYPE_PORT1_SHIFT;
                break;
        case 2:
-               val = (val & ESPC_PHY_TYPE_PORT2) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT2) >>
                        ESPC_PHY_TYPE_PORT2_SHIFT;
                break;
        case 3:
-               val = (val & ESPC_PHY_TYPE_PORT3) >>
+               val8 = (val & ESPC_PHY_TYPE_PORT3) >>
                        ESPC_PHY_TYPE_PORT3_SHIFT;
                break;
        default:
@@ -6143,9 +6143,9 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
                        np->port);
                return -EINVAL;
        }
-       niudbg(PROBE, "SPROM: PHY type %llx\n", (unsigned long long) val);
+       niudbg(PROBE, "SPROM: PHY type %x\n", val8);
 
-       switch (val) {
+       switch (val8) {
        case ESPC_PHY_TYPE_1G_COPPER:
                /* 1G copper, MII */
                np->flags &= ~(NIU_FLAGS_FIBER |
@@ -6175,8 +6175,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
                break;
 
        default:
-               dev_err(np->device, PFX "Bogus SPROM phy type %llu\n",
-                       (unsigned long long) val);
+               dev_err(np->device, PFX "Bogus SPROM phy type %u\n", val8);
                return -EINVAL;
        }