diff options
author | Andy Fleming <afleming@freescale.com> | 2008-04-09 20:38:27 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-16 20:09:35 -0400 |
commit | c5e38a949bfa11d10f73927fbf4fe66b73bc3001 (patch) | |
tree | fab958be46c87f31fa3841937a8b9d2b1db73a49 | |
parent | 9d9326d3bc0ea9a8bbe40bf3e5e66c7b9858caa0 (diff) |
phy: Clean up header style
Multi-line comments weren't all CodingStyle compliant
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | include/linux/phy.h | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 6509f377bb10..2d838448415c 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
@@ -39,7 +39,8 @@ | |||
39 | SUPPORTED_1000baseT_Half | \ | 39 | SUPPORTED_1000baseT_Half | \ |
40 | SUPPORTED_1000baseT_Full) | 40 | SUPPORTED_1000baseT_Full) |
41 | 41 | ||
42 | /* Set phydev->irq to PHY_POLL if interrupts are not supported, | 42 | /* |
43 | * Set phydev->irq to PHY_POLL if interrupts are not supported, | ||
43 | * or not desired for this PHY. Set to PHY_IGNORE_INTERRUPT if | 44 | * or not desired for this PHY. Set to PHY_IGNORE_INTERRUPT if |
44 | * the attached driver handles the interrupt | 45 | * the attached driver handles the interrupt |
45 | */ | 46 | */ |
@@ -80,8 +81,10 @@ typedef enum { | |||
80 | */ | 81 | */ |
81 | #define MII_BUS_ID_SIZE (BUS_ID_SIZE - 3) | 82 | #define MII_BUS_ID_SIZE (BUS_ID_SIZE - 3) |
82 | 83 | ||
83 | /* The Bus class for PHYs. Devices which provide access to | 84 | /* |
84 | * PHYs should register using this structure */ | 85 | * The Bus class for PHYs. Devices which provide access to |
86 | * PHYs should register using this structure | ||
87 | */ | ||
85 | struct mii_bus { | 88 | struct mii_bus { |
86 | const char *name; | 89 | const char *name; |
87 | char id[MII_BUS_ID_SIZE]; | 90 | char id[MII_BUS_ID_SIZE]; |
@@ -90,8 +93,10 @@ struct mii_bus { | |||
90 | int (*write)(struct mii_bus *bus, int phy_id, int regnum, u16 val); | 93 | int (*write)(struct mii_bus *bus, int phy_id, int regnum, u16 val); |
91 | int (*reset)(struct mii_bus *bus); | 94 | int (*reset)(struct mii_bus *bus); |
92 | 95 | ||
93 | /* A lock to ensure that only one thing can read/write | 96 | /* |
94 | * the MDIO bus at a time */ | 97 | * A lock to ensure that only one thing can read/write |
98 | * the MDIO bus at a time | ||
99 | */ | ||
95 | struct mutex mdio_lock; | 100 | struct mutex mdio_lock; |
96 | 101 | ||
97 | struct device *dev; | 102 | struct device *dev; |
@@ -102,8 +107,10 @@ struct mii_bus { | |||
102 | /* Phy addresses to be ignored when probing */ | 107 | /* Phy addresses to be ignored when probing */ |
103 | u32 phy_mask; | 108 | u32 phy_mask; |
104 | 109 | ||
105 | /* Pointer to an array of interrupts, each PHY's | 110 | /* |
106 | * interrupt at the index matching its address */ | 111 | * Pointer to an array of interrupts, each PHY's |
112 | * interrupt at the index matching its address | ||
113 | */ | ||
107 | int *irq; | 114 | int *irq; |
108 | }; | 115 | }; |
109 | 116 | ||
@@ -255,7 +262,8 @@ struct phy_device { | |||
255 | /* Bus address of the PHY (0-32) */ | 262 | /* Bus address of the PHY (0-32) */ |
256 | int addr; | 263 | int addr; |
257 | 264 | ||
258 | /* forced speed & duplex (no autoneg) | 265 | /* |
266 | * forced speed & duplex (no autoneg) | ||
259 | * partner speed & duplex & pause (autoneg) | 267 | * partner speed & duplex & pause (autoneg) |
260 | */ | 268 | */ |
261 | int speed; | 269 | int speed; |
@@ -278,8 +286,10 @@ struct phy_device { | |||
278 | 286 | ||
279 | int link_timeout; | 287 | int link_timeout; |
280 | 288 | ||
281 | /* Interrupt number for this PHY | 289 | /* |
282 | * -1 means no interrupt */ | 290 | * Interrupt number for this PHY |
291 | * -1 means no interrupt | ||
292 | */ | ||
283 | int irq; | 293 | int irq; |
284 | 294 | ||
285 | /* private data pointer */ | 295 | /* private data pointer */ |
@@ -329,22 +339,28 @@ struct phy_driver { | |||
329 | u32 features; | 339 | u32 features; |
330 | u32 flags; | 340 | u32 flags; |
331 | 341 | ||
332 | /* Called to initialize the PHY, | 342 | /* |
333 | * including after a reset */ | 343 | * Called to initialize the PHY, |
344 | * including after a reset | ||
345 | */ | ||
334 | int (*config_init)(struct phy_device *phydev); | 346 | int (*config_init)(struct phy_device *phydev); |
335 | 347 | ||
336 | /* Called during discovery. Used to set | 348 | /* |
337 | * up device-specific structures, if any */ | 349 | * Called during discovery. Used to set |
350 | * up device-specific structures, if any | ||
351 | */ | ||
338 | int (*probe)(struct phy_device *phydev); | 352 | int (*probe)(struct phy_device *phydev); |
339 | 353 | ||
340 | /* PHY Power Management */ | 354 | /* PHY Power Management */ |
341 | int (*suspend)(struct phy_device *phydev); | 355 | int (*suspend)(struct phy_device *phydev); |
342 | int (*resume)(struct phy_device *phydev); | 356 | int (*resume)(struct phy_device *phydev); |
343 | 357 | ||
344 | /* Configures the advertisement and resets | 358 | /* |
359 | * Configures the advertisement and resets | ||
345 | * autonegotiation if phydev->autoneg is on, | 360 | * autonegotiation if phydev->autoneg is on, |
346 | * forces the speed to the current settings in phydev | 361 | * forces the speed to the current settings in phydev |
347 | * if phydev->autoneg is off */ | 362 | * if phydev->autoneg is off |
363 | */ | ||
348 | int (*config_aneg)(struct phy_device *phydev); | 364 | int (*config_aneg)(struct phy_device *phydev); |
349 | 365 | ||
350 | /* Determines the negotiated speed and duplex */ | 366 | /* Determines the negotiated speed and duplex */ |