Commit 0e0f27dd authored by Zach Brown's avatar Zach Brown Committed by David S. Miller

skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds namespace

Adding led support for phy causes namespace conflicts for some
phy drivers.

The marvel skge driver declared an enum for representing the states of
Link LED Register. The enum contained constant LED_OFF which conflicted
with declartation found in linux/leds.h.
LED_OFF changed to LED_REG_OFF
Also changed LED_ON to LED_REG_ON to avoid possible future conflict and
for consistency.
Signed-off-by: default avatarZach Brown <zach.brown@ni.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5bb61cb5
...@@ -1048,7 +1048,7 @@ static const char *skge_pause(enum pause_status status) ...@@ -1048,7 +1048,7 @@ static const char *skge_pause(enum pause_status status)
static void skge_link_up(struct skge_port *skge) static void skge_link_up(struct skge_port *skge)
{ {
skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG),
LED_BLK_OFF|LED_SYNC_OFF|LED_ON); LED_BLK_OFF|LED_SYNC_OFF|LED_REG_ON);
netif_carrier_on(skge->netdev); netif_carrier_on(skge->netdev);
netif_wake_queue(skge->netdev); netif_wake_queue(skge->netdev);
...@@ -1062,7 +1062,7 @@ static void skge_link_up(struct skge_port *skge) ...@@ -1062,7 +1062,7 @@ static void skge_link_up(struct skge_port *skge)
static void skge_link_down(struct skge_port *skge) static void skge_link_down(struct skge_port *skge)
{ {
skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF); skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_REG_OFF);
netif_carrier_off(skge->netdev); netif_carrier_off(skge->netdev);
netif_stop_queue(skge->netdev); netif_stop_queue(skge->netdev);
...@@ -2668,7 +2668,7 @@ static int skge_down(struct net_device *dev) ...@@ -2668,7 +2668,7 @@ static int skge_down(struct net_device *dev)
if (hw->ports == 1) if (hw->ports == 1)
free_irq(hw->pdev->irq, hw); free_irq(hw->pdev->irq, hw);
skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF); skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_REG_OFF);
if (is_genesis(hw)) if (is_genesis(hw))
genesis_stop(skge); genesis_stop(skge);
else else
......
...@@ -662,8 +662,8 @@ enum { ...@@ -662,8 +662,8 @@ enum {
LED_BLK_OFF = 1<<4, /* Link LED Blinking Off */ LED_BLK_OFF = 1<<4, /* Link LED Blinking Off */
LED_SYNC_ON = 1<<3, /* Use Sync Wire to switch LED */ LED_SYNC_ON = 1<<3, /* Use Sync Wire to switch LED */
LED_SYNC_OFF = 1<<2, /* Disable Sync Wire Input */ LED_SYNC_OFF = 1<<2, /* Disable Sync Wire Input */
LED_ON = 1<<1, /* switch LED on */ LED_REG_ON = 1<<1, /* switch LED on */
LED_OFF = 1<<0, /* switch LED off */ LED_REG_OFF = 1<<0, /* switch LED off */
}; };
/* Receive GMAC FIFO (YUKON) */ /* Receive GMAC FIFO (YUKON) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment