aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2015-07-24 14:24:02 -0400
committerDavid S. Miller <davem@davemloft.net>2015-07-27 04:10:29 -0400
commit8bcbf82f31a94f8e4f939ac57478d808263c3890 (patch)
tree3d5104b7312ffefc99303b456c8ac4be69ab3dcc
parenta35919e174350d3e236ea5f179177396e87b6894 (diff)
net/macb: suppress compiler warnings
This patch fixes the following warnings: drivers/net/ethernet/cadence/macb.c: In function ‘macb_handle_link_change’: drivers/net/ethernet/cadence/macb.c:266: warning: comparison between signed and unsigned drivers/net/ethernet/cadence/macb.c:267: warning: comparison between signed and unsigned drivers/net/ethernet/cadence/macb.c:291: warning: comparison between signed and unsigned drivers/net/ethernet/cadence/macb.c: In function ‘gem_update_stats’: drivers/net/ethernet/cadence/macb.c:1908: warning: comparison between signed and unsigned drivers/net/ethernet/cadence/macb.c: In function ‘gem_get_ethtool_strings’: drivers/net/ethernet/cadence/macb.c:1988: warning: comparison between signed and unsigned Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/cadence/macb.c5
-rw-r--r--drivers/net/ethernet/cadence/macb.h6
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index c4ffab9af563..77a5270ccae5 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -303,7 +303,6 @@ static void macb_handle_link_change(struct net_device *dev)
303 struct macb *bp = netdev_priv(dev); 303 struct macb *bp = netdev_priv(dev);
304 struct phy_device *phydev = bp->phy_dev; 304 struct phy_device *phydev = bp->phy_dev;
305 unsigned long flags; 305 unsigned long flags;
306
307 int status_change = 0; 306 int status_change = 0;
308 307
309 spin_lock_irqsave(&bp->lock, flags); 308 spin_lock_irqsave(&bp->lock, flags);
@@ -1936,7 +1935,7 @@ static int macb_change_mtu(struct net_device *dev, int new_mtu)
1936 1935
1937static void gem_update_stats(struct macb *bp) 1936static void gem_update_stats(struct macb *bp)
1938{ 1937{
1939 int i; 1938 unsigned int i;
1940 u32 *p = &bp->hw_stats.gem.tx_octets_31_0; 1939 u32 *p = &bp->hw_stats.gem.tx_octets_31_0;
1941 1940
1942 for (i = 0; i < GEM_STATS_LEN; ++i, ++p) { 1941 for (i = 0; i < GEM_STATS_LEN; ++i, ++p) {
@@ -2015,7 +2014,7 @@ static int gem_get_sset_count(struct net_device *dev, int sset)
2015 2014
2016static void gem_get_ethtool_strings(struct net_device *dev, u32 sset, u8 *p) 2015static void gem_get_ethtool_strings(struct net_device *dev, u32 sset, u8 *p)
2017{ 2016{
2018 int i; 2017 unsigned int i;
2019 2018
2020 switch (sset) { 2019 switch (sset) {
2021 case ETH_SS_STATS: 2020 case ETH_SS_STATS:
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index f245340f4dde..2aa102ecff6c 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -816,9 +816,9 @@ struct macb {
816 816
817 struct mii_bus *mii_bus; 817 struct mii_bus *mii_bus;
818 struct phy_device *phy_dev; 818 struct phy_device *phy_dev;
819 unsigned int link; 819 int link;
820 unsigned int speed; 820 int speed;
821 unsigned int duplex; 821 int duplex;
822 822
823 u32 caps; 823 u32 caps;
824 unsigned int dma_burst_length; 824 unsigned int dma_burst_length;