e1000: sparse warnings fixes

Fix sparse warnings and problems from e1000 driver.

Added a sparse fix for the module param array index
-- Auke

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 12 insertions, 17 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 6c9a643426f5..667f18bcc172 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -32,9 +32,6 @@
 
 #include <asm/uaccess.h>
 
-extern char e1000_driver_name[];
-extern char e1000_driver_version[];
-
 extern int e1000_up(struct e1000_adapter *adapter);
 extern void e1000_down(struct e1000_adapter *adapter);
 extern void e1000_reinit_locked(struct e1000_adapter *adapter);
@@ -733,16 +730,16 @@ err_setup:
 
 #define REG_PATTERN_TEST(R, M, W)                                              \
 {                                                                              \
-        uint32_t pat, value;                                                   \
-        uint32_t test[] =                                                      \
+        uint32_t pat, val;                                                     \
+        const uint32_t test[] =                                                \
                 {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};              \
-        for (pat = 0; pat < ARRAY_SIZE(test); pat++) {              \
+        for (pat = 0; pat < ARRAY_SIZE(test); pat++) {                         \
                 E1000_WRITE_REG(&adapter->hw, R, (test[pat] & W));             \
-                value = E1000_READ_REG(&adapter->hw, R);                       \
-                if (value != (test[pat] & W & M)) {                             \
+                val = E1000_READ_REG(&adapter->hw, R);                         \
+                if (val != (test[pat] & W & M)) {                              \
                         DPRINTK(DRV, ERR, "pattern test reg %04X failed: got " \
                                 "0x%08X expected 0x%08X\n",                    \
-                                E1000_##R, value, (test[pat] & W & M));        \
+                                E1000_##R, val, (test[pat] & W & M));          \
                         *data = (adapter->hw.mac_type < e1000_82543) ?         \
                                 E1000_82542_##R : E1000_##R;                   \
                         return 1;                                              \
@@ -752,12 +749,12 @@ err_setup:
 
 #define REG_SET_AND_CHECK(R, M, W)                                             \
 {                                                                              \
-        uint32_t value;                                                        \
+        uint32_t val;                                                          \
         E1000_WRITE_REG(&adapter->hw, R, W & M);                               \
-        value = E1000_READ_REG(&adapter->hw, R);                               \
-        if ((W & M) != (value & M)) {                                          \
+        val = E1000_READ_REG(&adapter->hw, R);                                 \
+        if ((W & M) != (val & M)) {                                            \
                 DPRINTK(DRV, ERR, "set/check reg %04X test failed: got 0x%08X "\
-                        "expected 0x%08X\n", E1000_##R, (value & M), (W & M)); \
+                        "expected 0x%08X\n", E1000_##R, (val & M), (W & M));   \
                 *data = (adapter->hw.mac_type < e1000_82543) ?                 \
                         E1000_82542_##R : E1000_##R;                           \
                 return 1;                                                      \
@@ -1621,8 +1618,6 @@ e1000_get_sset_count(struct net_device *netdev, int sset)
         }
 }
 
-extern void e1000_power_up_phy(struct e1000_adapter *);
-
 static void
 e1000_diag_test(struct net_device *netdev,
                    struct ethtool_test *eth_test, uint64_t *data)
@@ -1859,8 +1854,8 @@ e1000_phys_id(struct net_device *netdev, uint32_t data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
-        if (!data || data > (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ))
-                data = (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ);
+        if (!data)
+                data = INT_MAX;
 
         if (adapter->hw.mac_type < e1000_82571) {
                 if (!adapter->blink_timer.function) {