aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/phy.h
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2014-01-04 19:20:17 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-04 19:27:58 -0500
commit4017b4d3212b7b9d979d7174cbe340c9acbb4666 (patch)
treeb21cbe1e1bcd6d90149df801d3ec450491002759 /include/linux/phy.h
parent02d320c3e3ec076cde57558146de9e7c28e2f003 (diff)
<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: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/phy.h')
-rw-r--r--include/linux/phy.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 73384ff3b5e5..d4cb756a41c5 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1,6 +1,4 @@
1/* 1/*
2 * include/linux/phy.h
3 *
4 * Framework and drivers for configuring and reading different PHYs 2 * Framework and drivers for configuring and reading different PHYs
5 * Based on code in sungem_phy.c and gianfar_phy.c 3 * Based on code in sungem_phy.c and gianfar_phy.c
6 * 4 *
@@ -240,7 +238,7 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);
240 * - phy_stop moves to HALTED 238 * - phy_stop moves to HALTED
241 */ 239 */
242enum phy_state { 240enum phy_state {
243 PHY_DOWN=0, 241 PHY_DOWN = 0,
244 PHY_STARTING, 242 PHY_STARTING,
245 PHY_READY, 243 PHY_READY,
246 PHY_PENDING, 244 PHY_PENDING,
@@ -544,21 +542,22 @@ static inline bool phy_is_internal(struct phy_device *phydev)
544} 542}
545 543
546struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, 544struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
547 bool is_c45, struct phy_c45_device_ids *c45_ids); 545 bool is_c45,
546 struct phy_c45_device_ids *c45_ids);
548struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45); 547struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);
549int phy_device_register(struct phy_device *phy); 548int phy_device_register(struct phy_device *phy);
550int phy_init_hw(struct phy_device *phydev); 549int phy_init_hw(struct phy_device *phydev);
551int phy_suspend(struct phy_device *phydev); 550int phy_suspend(struct phy_device *phydev);
552int phy_resume(struct phy_device *phydev); 551int phy_resume(struct phy_device *phydev);
553struct phy_device * phy_attach(struct net_device *dev, 552struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,
554 const char *bus_id, phy_interface_t interface); 553 phy_interface_t interface);
555struct phy_device *phy_find_first(struct mii_bus *bus); 554struct phy_device *phy_find_first(struct mii_bus *bus);
556int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, 555int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,
557 void (*handler)(struct net_device *), 556 void (*handler)(struct net_device *),
558 phy_interface_t interface); 557 phy_interface_t interface);
559struct phy_device * phy_connect(struct net_device *dev, const char *bus_id, 558struct phy_device *phy_connect(struct net_device *dev, const char *bus_id,
560 void (*handler)(struct net_device *), 559 void (*handler)(struct net_device *),
561 phy_interface_t interface); 560 phy_interface_t interface);
562void phy_disconnect(struct phy_device *phydev); 561void phy_disconnect(struct phy_device *phydev);
563void phy_detach(struct phy_device *phydev); 562void phy_detach(struct phy_device *phydev);
564void phy_start(struct phy_device *phydev); 563void phy_start(struct phy_device *phydev);
@@ -567,7 +566,8 @@ int phy_start_aneg(struct phy_device *phydev);
567 566
568int phy_stop_interrupts(struct phy_device *phydev); 567int phy_stop_interrupts(struct phy_device *phydev);
569 568
570static inline int phy_read_status(struct phy_device *phydev) { 569static inline int phy_read_status(struct phy_device *phydev)
570{
571 return phydev->drv->read_status(phydev); 571 return phydev->drv->read_status(phydev);
572} 572}
573 573
@@ -586,22 +586,21 @@ void phy_state_machine(struct work_struct *work);
586void phy_change(struct work_struct *work); 586void phy_change(struct work_struct *work);
587void phy_mac_interrupt(struct phy_device *phydev, int new_link); 587void phy_mac_interrupt(struct phy_device *phydev, int new_link);
588void phy_start_machine(struct phy_device *phydev, 588void phy_start_machine(struct phy_device *phydev,
589 void (*handler)(struct net_device *)); 589 void (*handler)(struct net_device *));
590void phy_stop_machine(struct phy_device *phydev); 590void phy_stop_machine(struct phy_device *phydev);
591int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); 591int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
592int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); 592int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
593int phy_mii_ioctl(struct phy_device *phydev, 593int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
594 struct ifreq *ifr, int cmd);
595int phy_start_interrupts(struct phy_device *phydev); 594int phy_start_interrupts(struct phy_device *phydev);
596void phy_print_status(struct phy_device *phydev); 595void phy_print_status(struct phy_device *phydev);
597void phy_device_free(struct phy_device *phydev); 596void phy_device_free(struct phy_device *phydev);
598 597
599int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, 598int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
600 int (*run)(struct phy_device *)); 599 int (*run)(struct phy_device *));
601int phy_register_fixup_for_id(const char *bus_id, 600int phy_register_fixup_for_id(const char *bus_id,
602 int (*run)(struct phy_device *)); 601 int (*run)(struct phy_device *));
603int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask, 602int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
604 int (*run)(struct phy_device *)); 603 int (*run)(struct phy_device *));
605int phy_scan_fixups(struct phy_device *phydev); 604int phy_scan_fixups(struct phy_device *phydev);
606 605
607int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable); 606int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable);
@@ -609,7 +608,8 @@ int phy_get_eee_err(struct phy_device *phydev);
609int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data); 608int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data);
610int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data); 609int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data);
611int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol); 610int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol);
612void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol); 611void phy_ethtool_get_wol(struct phy_device *phydev,
612 struct ethtool_wolinfo *wol);
613 613
614int __init mdio_bus_init(void); 614int __init mdio_bus_init(void);
615void mdio_bus_exit(void); 615void mdio_bus_exit(void);