mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
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: Zach Brown <zach.brown@ni.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5bb61cb5fd
commit
0e0f27dd65
2 changed files with 5 additions and 5 deletions
|
@ -1048,7 +1048,7 @@ static const char *skge_pause(enum pause_status status)
|
|||
static void skge_link_up(struct skge_port *skge)
|
||||
{
|
||||
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_wake_queue(skge->netdev);
|
||||
|
@ -1062,7 +1062,7 @@ static void skge_link_up(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_stop_queue(skge->netdev);
|
||||
|
||||
|
@ -2668,7 +2668,7 @@ static int skge_down(struct net_device *dev)
|
|||
if (hw->ports == 1)
|
||||
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))
|
||||
genesis_stop(skge);
|
||||
else
|
||||
|
|
|
@ -662,8 +662,8 @@ enum {
|
|||
LED_BLK_OFF = 1<<4, /* Link LED Blinking Off */
|
||||
LED_SYNC_ON = 1<<3, /* Use Sync Wire to switch LED */
|
||||
LED_SYNC_OFF = 1<<2, /* Disable Sync Wire Input */
|
||||
LED_ON = 1<<1, /* switch LED on */
|
||||
LED_OFF = 1<<0, /* switch LED off */
|
||||
LED_REG_ON = 1<<1, /* switch LED on */
|
||||
LED_REG_OFF = 1<<0, /* switch LED off */
|
||||
};
|
||||
|
||||
/* Receive GMAC FIFO (YUKON) */
|
||||
|
|
Loading…
Reference in a new issue