diff options
author | Lothar Waßmann <LW@KARO-electronics.de> | 2011-12-07 16:59:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-08 19:51:19 -0500 |
commit | a7dd3219b915577e12612ac5d269e1bd22c6fb65 (patch) | |
tree | c7ff724ce6e1169f3c8417640da680617034c540 /drivers/net/ethernet/freescale/fec.c | |
parent | efab79c5c3bf830a41b2f737146a9b70c0e13f44 (diff) |
net/fec: misc cleanups
- remove some bogus whitespace
- remove line wraps from printk messages
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec.c')
-rw-r--r-- | drivers/net/ethernet/freescale/fec.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 1124ce0a1594..f224e58af112 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c | |||
@@ -99,7 +99,7 @@ static struct platform_device_id fec_devtype[] = { | |||
99 | MODULE_DEVICE_TABLE(platform, fec_devtype); | 99 | MODULE_DEVICE_TABLE(platform, fec_devtype); |
100 | 100 | ||
101 | enum imx_fec_type { | 101 | enum imx_fec_type { |
102 | IMX25_FEC = 1, /* runs on i.mx25/50/53 */ | 102 | IMX25_FEC = 1, /* runs on i.mx25/50/53 */ |
103 | IMX27_FEC, /* runs on i.mx27/35/51 */ | 103 | IMX27_FEC, /* runs on i.mx27/35/51 */ |
104 | IMX28_FEC, | 104 | IMX28_FEC, |
105 | IMX6Q_FEC, | 105 | IMX6Q_FEC, |
@@ -132,7 +132,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); | |||
132 | #elif defined (CONFIG_M5272C3) | 132 | #elif defined (CONFIG_M5272C3) |
133 | #define FEC_FLASHMAC (0xffe04000 + 4) | 133 | #define FEC_FLASHMAC (0xffe04000 + 4) |
134 | #elif defined(CONFIG_MOD5272) | 134 | #elif defined(CONFIG_MOD5272) |
135 | #define FEC_FLASHMAC 0xffc0406b | 135 | #define FEC_FLASHMAC 0xffc0406b |
136 | #else | 136 | #else |
137 | #define FEC_FLASHMAC 0 | 137 | #define FEC_FLASHMAC 0 |
138 | #endif | 138 | #endif |
@@ -972,8 +972,9 @@ static int fec_enet_mii_probe(struct net_device *ndev) | |||
972 | } | 972 | } |
973 | 973 | ||
974 | if (phy_id >= PHY_MAX_ADDR) { | 974 | if (phy_id >= PHY_MAX_ADDR) { |
975 | printk(KERN_INFO "%s: no PHY, assuming direct connection " | 975 | printk(KERN_INFO |
976 | "to switch\n", ndev->name); | 976 | "%s: no PHY, assuming direct connection to switch\n", |
977 | ndev->name); | ||
977 | strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); | 978 | strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); |
978 | phy_id = 0; | 979 | phy_id = 0; |
979 | } | 980 | } |
@@ -998,8 +999,9 @@ static int fec_enet_mii_probe(struct net_device *ndev) | |||
998 | fep->link = 0; | 999 | fep->link = 0; |
999 | fep->full_duplex = 0; | 1000 | fep->full_duplex = 0; |
1000 | 1001 | ||
1001 | printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] " | 1002 | printk(KERN_INFO |
1002 | "(mii_bus:phy_addr=%s, irq=%d)\n", ndev->name, | 1003 | "%s: Freescale FEC PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n", |
1004 | ndev->name, | ||
1003 | fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev), | 1005 | fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev), |
1004 | fep->phy_dev->irq); | 1006 | fep->phy_dev->irq); |
1005 | 1007 | ||