Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a9d41192b96559aa3658bc7886468a46da911c76
Commit:     a9d41192b96559aa3658bc7886468a46da911c76
Parent:     f937f1f46b6d2f9bef94e0d6b769a4c67615d34e
Author:     Al Viro <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 15 01:42:31 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Oct 15 12:26:33 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/net/niu.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 54166bd..ed1f9bb 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)
        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;
        }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to