diff options
Diffstat (limited to 'drivers/net/bfin_mac.c')
-rw-r--r-- | drivers/net/bfin_mac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 3db7db1828e7..df896e23e2c5 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
@@ -811,7 +811,7 @@ static void bfin_mac_enable(void) | |||
811 | { | 811 | { |
812 | u32 opmode; | 812 | u32 opmode; |
813 | 813 | ||
814 | pr_debug("%s: %s\n", DRV_NAME, __FUNCTION__); | 814 | pr_debug("%s: %s\n", DRV_NAME, __func__); |
815 | 815 | ||
816 | /* Set RX DMA */ | 816 | /* Set RX DMA */ |
817 | bfin_write_DMA1_NEXT_DESC_PTR(&(rx_list_head->desc_a)); | 817 | bfin_write_DMA1_NEXT_DESC_PTR(&(rx_list_head->desc_a)); |
@@ -847,7 +847,7 @@ static void bfin_mac_enable(void) | |||
847 | /* Our watchdog timed out. Called by the networking layer */ | 847 | /* Our watchdog timed out. Called by the networking layer */ |
848 | static void bfin_mac_timeout(struct net_device *dev) | 848 | static void bfin_mac_timeout(struct net_device *dev) |
849 | { | 849 | { |
850 | pr_debug("%s: %s\n", dev->name, __FUNCTION__); | 850 | pr_debug("%s: %s\n", dev->name, __func__); |
851 | 851 | ||
852 | bfin_mac_disable(); | 852 | bfin_mac_disable(); |
853 | 853 | ||
@@ -949,7 +949,7 @@ static int bfin_mac_open(struct net_device *dev) | |||
949 | { | 949 | { |
950 | struct bfin_mac_local *lp = netdev_priv(dev); | 950 | struct bfin_mac_local *lp = netdev_priv(dev); |
951 | int retval; | 951 | int retval; |
952 | pr_debug("%s: %s\n", dev->name, __FUNCTION__); | 952 | pr_debug("%s: %s\n", dev->name, __func__); |
953 | 953 | ||
954 | /* | 954 | /* |
955 | * Check that the address is valid. If its not, refuse | 955 | * Check that the address is valid. If its not, refuse |
@@ -989,7 +989,7 @@ static int bfin_mac_open(struct net_device *dev) | |||
989 | static int bfin_mac_close(struct net_device *dev) | 989 | static int bfin_mac_close(struct net_device *dev) |
990 | { | 990 | { |
991 | struct bfin_mac_local *lp = netdev_priv(dev); | 991 | struct bfin_mac_local *lp = netdev_priv(dev); |
992 | pr_debug("%s: %s\n", dev->name, __FUNCTION__); | 992 | pr_debug("%s: %s\n", dev->name, __func__); |
993 | 993 | ||
994 | netif_stop_queue(dev); | 994 | netif_stop_queue(dev); |
995 | netif_carrier_off(dev); | 995 | netif_carrier_off(dev); |