Merge tag 'master-2014-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[linux-2.6-microblaze.git] / drivers / staging / octeon / ethernet-util.h

diff --git a/drivers/staging/octeon/ethernet-util.h b/drivers/staging/octeon/ethernet-util.h
index 2da5ce1..0f9b4a1 100644 (file)
--- a/drivers/staging/octeon/ethernet-util.h
+++ b/drivers/staging/octeon/ethernet-util.h
@@ -53,8 +53,7 @@ static inline int INTERFACE(int ipd_port)
                return 3;
        else if (ipd_port == 40)        /* Non existent interface for POW0 */
                return 4;
-       else
-               panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port);
+       panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port);
 }
 
 /**
@@ -67,6 +66,5 @@ static inline int INDEX(int ipd_port)
 {
        if (ipd_port < 32)
                return ipd_port & 15;
-       else
-               return ipd_port & 3;
+       return ipd_port & 3;
 }