Message ID | 1292697704-2886-2-git-send-email-jhautbois@gmail.com |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
On Sat, 2010-12-18 at 19:41 +0100, Jean-Michel Hautbois wrote: > Fixes some coding style issues (errors and warnings). Hi Jean-Michel. > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c [] > @@ -47,11 +47,11 @@ void phy_print_status(struct phy_device *phydev) > pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev), > phydev->link ? "Up" : "Down"); > if (phydev->link) > - printk(" - %d/%s", phydev->speed, > + pr_info(" - %d/%s", phydev->speed, > DUPLEX_FULL == phydev->duplex ? > "Full" : "Half"); > > - printk("\n"); > + pr_info("\n"); This isn't the right way to fix this actually. The first pr_info is not terminated with a newline, so the second printk should be printk(KERN_CONT or pr_cont instead. Ideally, you would make a different change. There should be just one printk/pr_info. Fewer messages, couldn't be interleaved with other simultaneous output, easier to grep, etc... I think something like this would be better: if (phydev->link) pr_info("PHY: %s - Link is down\n", dev_name(&phydev->dev)); else pr_info("PHY: %s - Link is up - %d/%s\n", dev_name(&phydev->dev), phydev->speed, phydev->duplex == DUPLEX_FULL ? "Full" : "Half"); or maybe use dev_info like this: if (phydev->link) dev_info(&phydev->dev, "PHY: Link is down\n"); else dev_info(&phydev->dev, "PHY: Link is up - %d/%s\n", phydev->speed, phydev->duplex == DUPLEX_FULL ? "Full" : "Half"); cheers, Joe -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 5f23e8e..d6a9b29 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -33,10 +33,10 @@ #include <linux/timer.h> #include <linux/workqueue.h> -#include <asm/atomic.h> -#include <asm/io.h> +#include <linux/atomic.h> +#include <linux/io.h> #include <asm/irq.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> /** * phy_print_status - Convenience function to print out the current phy status @@ -47,11 +47,11 @@ void phy_print_status(struct phy_device *phydev) pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev), phydev->link ? "Up" : "Down"); if (phydev->link) - printk(" - %d/%s", phydev->speed, + pr_info(" - %d/%s", phydev->speed, DUPLEX_FULL == phydev->duplex ? "Full" : "Half"); - printk("\n"); + pr_info("\n"); } EXPORT_SYMBOL(phy_print_status); @@ -325,7 +325,7 @@ int phy_mii_ioctl(struct phy_device *phydev, case SIOCSMIIREG: if (mii_data->phy_id == phydev->addr) { - switch(mii_data->reg_num) { + switch (mii_data->reg_num) { case MII_BMCR: if ((val & (BMCR_RESET|BMCR_ANENABLE)) == 0) phydev->autoneg = AUTONEG_DISABLE; @@ -352,7 +352,7 @@ int phy_mii_ioctl(struct phy_device *phydev, } phy_write(phydev, mii_data->reg_num, val); - + if (mii_data->reg_num == MII_BMCR && val & BMCR_RESET && phydev->drv->config_init) { @@ -471,7 +471,7 @@ static void phy_force_reduction(struct phy_device *phydev) int idx; idx = phy_find_setting(phydev->speed, phydev->duplex); - + idx++; idx = phy_find_valid(idx, phydev->supported); @@ -732,6 +732,7 @@ out_unlock: * will not reenable interrupts. */ } +EXPORT_SYMBOL(phy_stop); /** @@ -762,7 +763,6 @@ void phy_start(struct phy_device *phydev) } mutex_unlock(&phydev->lock); } -EXPORT_SYMBOL(phy_stop); EXPORT_SYMBOL(phy_start); /** @@ -782,7 +782,7 @@ void phy_state_machine(struct work_struct *work) if (phydev->adjust_state) phydev->adjust_state(phydev->attached_dev); - switch(phydev->state) { + switch (phydev->state) { case PHY_DOWN: case PHY_STARTING: case PHY_READY:
Fixes some coding style issues (errors and warnings). Signed-off-by: Jean-Michel Hautbois <jhautbois@gmail.com> --- drivers/net/phy/phy.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)