Commit 4017b4d3 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller

<linux/phy.h>: coding style fixes

Running 'checkpatch.pl' gives some errors and warnings:

- no spaces around =;

- * separated by space from the function name;

- { in function definition not on a separate line;

- line over 80 characters.

While fixing these, also fix the following style issues:

- file name in the heading comment;

- alignment not matching open paren.
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02d320c3
/* /*
* include/linux/phy.h
*
* Framework and drivers for configuring and reading different PHYs * Framework and drivers for configuring and reading different PHYs
* Based on code in sungem_phy.c and gianfar_phy.c * Based on code in sungem_phy.c and gianfar_phy.c
* *
...@@ -240,7 +238,7 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val); ...@@ -240,7 +238,7 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);
* - phy_stop moves to HALTED * - phy_stop moves to HALTED
*/ */
enum phy_state { enum phy_state {
PHY_DOWN=0, PHY_DOWN = 0,
PHY_STARTING, PHY_STARTING,
PHY_READY, PHY_READY,
PHY_PENDING, PHY_PENDING,
...@@ -544,21 +542,22 @@ static inline bool phy_is_internal(struct phy_device *phydev) ...@@ -544,21 +542,22 @@ static inline bool phy_is_internal(struct phy_device *phydev)
} }
struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
bool is_c45, struct phy_c45_device_ids *c45_ids); bool is_c45,
struct phy_c45_device_ids *c45_ids);
struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45); struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);
int phy_device_register(struct phy_device *phy); int phy_device_register(struct phy_device *phy);
int phy_init_hw(struct phy_device *phydev); int phy_init_hw(struct phy_device *phydev);
int phy_suspend(struct phy_device *phydev); int phy_suspend(struct phy_device *phydev);
int phy_resume(struct phy_device *phydev); int phy_resume(struct phy_device *phydev);
struct phy_device * phy_attach(struct net_device *dev, struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,
const char *bus_id, phy_interface_t interface); phy_interface_t interface);
struct phy_device *phy_find_first(struct mii_bus *bus); struct phy_device *phy_find_first(struct mii_bus *bus);
int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
void (*handler)(struct net_device *), void (*handler)(struct net_device *),
phy_interface_t interface); phy_interface_t interface);
struct phy_device * phy_connect(struct net_device *dev, const char *bus_id, struct phy_device *phy_connect(struct net_device *dev, const char *bus_id,
void (*handler)(struct net_device *), void (*handler)(struct net_device *),
phy_interface_t interface); phy_interface_t interface);
void phy_disconnect(struct phy_device *phydev); void phy_disconnect(struct phy_device *phydev);
void phy_detach(struct phy_device *phydev); void phy_detach(struct phy_device *phydev);
void phy_start(struct phy_device *phydev); void phy_start(struct phy_device *phydev);
...@@ -567,7 +566,8 @@ int phy_start_aneg(struct phy_device *phydev); ...@@ -567,7 +566,8 @@ int phy_start_aneg(struct phy_device *phydev);
int phy_stop_interrupts(struct phy_device *phydev); int phy_stop_interrupts(struct phy_device *phydev);
static inline int phy_read_status(struct phy_device *phydev) { static inline int phy_read_status(struct phy_device *phydev)
{
return phydev->drv->read_status(phydev); return phydev->drv->read_status(phydev);
} }
...@@ -586,22 +586,21 @@ void phy_state_machine(struct work_struct *work); ...@@ -586,22 +586,21 @@ void phy_state_machine(struct work_struct *work);
void phy_change(struct work_struct *work); void phy_change(struct work_struct *work);
void phy_mac_interrupt(struct phy_device *phydev, int new_link); void phy_mac_interrupt(struct phy_device *phydev, int new_link);
void phy_start_machine(struct phy_device *phydev, void phy_start_machine(struct phy_device *phydev,
void (*handler)(struct net_device *)); void (*handler)(struct net_device *));
void phy_stop_machine(struct phy_device *phydev); void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_mii_ioctl(struct phy_device *phydev, int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
struct ifreq *ifr, int cmd);
int phy_start_interrupts(struct phy_device *phydev); int phy_start_interrupts(struct phy_device *phydev);
void phy_print_status(struct phy_device *phydev); void phy_print_status(struct phy_device *phydev);
void phy_device_free(struct phy_device *phydev); void phy_device_free(struct phy_device *phydev);
int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
int (*run)(struct phy_device *)); int (*run)(struct phy_device *));
int phy_register_fixup_for_id(const char *bus_id, int phy_register_fixup_for_id(const char *bus_id,
int (*run)(struct phy_device *)); int (*run)(struct phy_device *));
int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask, int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
int (*run)(struct phy_device *)); int (*run)(struct phy_device *));
int phy_scan_fixups(struct phy_device *phydev); int phy_scan_fixups(struct phy_device *phydev);
int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable); int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable);
...@@ -609,7 +608,8 @@ int phy_get_eee_err(struct phy_device *phydev); ...@@ -609,7 +608,8 @@ int phy_get_eee_err(struct phy_device *phydev);
int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data); int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data);
int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data); int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data);
int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol); int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol);
void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol); void phy_ethtool_get_wol(struct phy_device *phydev,
struct ethtool_wolinfo *wol);
int __init mdio_bus_init(void); int __init mdio_bus_init(void);
void mdio_bus_exit(void); void mdio_bus_exit(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment