evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/net/skge.c: Use (pr|netdev)_<level> macro helpers

Browse source 
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Remove #define PFX
Use pr_<level>
Use netdev_<level>
Checkpatch cleaning

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-02-17 15:01:58 +00:00 • committed by David S. Miller
parent f15063cdd6
commit 67777f9bf2
1 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/net/skge.c
View file

@ -71,9 +71,9 @@ MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION); MODULE_VERSION(DRV_VERSION);
static const u32 default_msg static const u32 default_msg = (NETIF_MSG_DRV | NETIF_MSG_PROBE |
= NETIF_MSG_DRV| NETIF_MSG_PROBE| NETIF_MSG_LINK NETIF_MSG_LINK | NETIF_MSG_IFUP |
| NETIF_MSG_IFUP| NETIF_MSG_IFDOWN; NETIF_MSG_IFDOWN);
static int debug = -1; /* defaults above */ static int debug = -1; /* defaults above */
module_param(debug, int, 0); module_param(debug, int, 0);
@ -188,8 +188,8 @@ static void skge_wol_init(struct skge_port *skge)
/* Force to 10/100 skge_reset will re-enable on resume */ /* Force to 10/100 skge_reset will re-enable on resume */
gm_phy_write(hw, port, PHY_MARV_AUNE_ADV, gm_phy_write(hw, port, PHY_MARV_AUNE_ADV,
PHY_AN_100FULL | PHY_AN_100HALF | (PHY_AN_100FULL | PHY_AN_100HALF |
PHY_AN_10FULL | PHY_AN_10HALF| PHY_AN_CSMA); PHY_AN_10FULL | PHY_AN_10HALF | PHY_AN_CSMA));
/* no 1000 HD/FD */ /* no 1000 HD/FD */
gm_phy_write(hw, port, PHY_MARV_1000T_CTRL, 0); gm_phy_write(hw, port, PHY_MARV_1000T_CTRL, 0);
gm_phy_write(hw, port, PHY_MARV_CTRL, gm_phy_write(hw, port, PHY_MARV_CTRL,
@ -258,25 +258,28 @@ static u32 skge_supported_modes(const struct skge_hw *hw)
u32 supported; u32 supported;
if (hw->copper) { if (hw->copper) {
supported = SUPPORTED_10baseT_Half supported = (SUPPORTED_10baseT_Half |
| SUPPORTED_10baseT_Full SUPPORTED_10baseT_Full |
| SUPPORTED_100baseT_Half SUPPORTED_100baseT_Half |
| SUPPORTED_100baseT_Full SUPPORTED_100baseT_Full |
| SUPPORTED_1000baseT_Half SUPPORTED_1000baseT_Half |
| SUPPORTED_1000baseT_Full SUPPORTED_1000baseT_Full |
| SUPPORTED_Autoneg| SUPPORTED_TP; SUPPORTED_Autoneg |
SUPPORTED_TP);
if (hw->chip_id == CHIP_ID_GENESIS) if (hw->chip_id == CHIP_ID_GENESIS)
supported &= ~(SUPPORTED_10baseT_Half supported &= ~(SUPPORTED_10baseT_Half |
| SUPPORTED_10baseT_Full SUPPORTED_10baseT_Full |
| SUPPORTED_100baseT_Half SUPPORTED_100baseT_Half |
| SUPPORTED_100baseT_Full); SUPPORTED_100baseT_Full);
else if (hw->chip_id == CHIP_ID_YUKON) else if (hw->chip_id == CHIP_ID_YUKON)
supported &= ~SUPPORTED_1000baseT_Half; supported &= ~SUPPORTED_1000baseT_Half;
} else } else
supported = SUPPORTED_1000baseT_Full | SUPPORTED_1000baseT_Half supported = (SUPPORTED_1000baseT_Full |
| SUPPORTED_FIBRE | SUPPORTED_Autoneg; SUPPORTED_1000baseT_Half |
SUPPORTED_FIBRE |
SUPPORTED_Autoneg);
return supported; return supported;
} }
@ -366,7 +369,7 @@ static int skge_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
} }
} }
return (0); return 0;
} }
static void skge_get_drvinfo(struct net_device *dev, static void skge_get_drvinfo(struct net_device *dev,
@ -3554,8 +3557,7 @@ static int skge_reset(struct skge_hw *hw)
hw->ram_offset = 0x80000; hw->ram_offset = 0x80000;
} else } else
hw->ram_size = t8 * 512; hw->ram_size = t8 * 512;
} } else if (t8 == 0)
else if (t8 == 0)
hw->ram_size = 0x20000; hw->ram_size = 0x20000;
else else
hw->ram_size = t8 * 4096; hw->ram_size = t8 * 4096;
@ -4010,7 +4012,8 @@ static void __devexit skge_remove(struct pci_dev *pdev)
flush_scheduled_work(); flush_scheduled_work();
if ((dev1 = hw->dev[1])) dev1 = hw->dev[1];
if (dev1)
unregister_netdev(dev1); unregister_netdev(dev1);
dev0 = hw->dev[0]; dev0 = hw->dev[0];
unregister_netdev(dev0); unregister_netdev(dev0);