diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-16 12:34:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-16 12:34:08 -0700 |
| commit | 63e96bc4e32811a2bc1e9172691e263e074a32ae (patch) | |
| tree | 193e30a0398dd4a9170a5af2f9ffd5c1ace67e79 /drivers/net/phy/dp83640.c | |
| parent | 56a967c4f7e5fed2e66d90906ff5956abf69364a (diff) | |
| parent | 16d4d650966d9a607b32ceb709248f7833d88ed0 (diff) | |
Merge branch 'net-phy-cleanups'
Weihang Li says:
====================
net: phy: fix some coding-style issues
Make some cleanups according to the coding style of kernel.
Changes since v1:
- Update commit description of #1 and #3.
- Avoid changing the indentation in #2.
- Change a group of if-else statement into switch from #4 and put it into
a single patch.
- Put '|' at the end of line in #5 and #7.
- Avoid deleting spaces in definition of 'settings' in #5.
- Drop #8 from the series which needs more discussion with David.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/dp83640.c')
| -rw-r--r-- | drivers/net/phy/dp83640.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index 0d79f68f301c..705c16675b80 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -170,9 +170,9 @@ static ushort gpio_tab[GPIO_TABLE_SIZE] = { module_param(chosen_phy, int, 0444); module_param_array(gpio_tab, ushort, NULL, 0444); -MODULE_PARM_DESC(chosen_phy, \ +MODULE_PARM_DESC(chosen_phy, "The address of the PHY to use for the ancillary clock features"); -MODULE_PARM_DESC(gpio_tab, \ +MODULE_PARM_DESC(gpio_tab, "Which GPIO line to use for which purpose: cal,perout,extts1,...,extts6"); static void dp83640_gpio_defaults(struct ptp_pin_desc *pd) @@ -615,6 +615,7 @@ static void prune_rx_ts(struct dp83640_private *dp83640) static void enable_broadcast(struct phy_device *phydev, int init_page, int on) { int val; + phy_write(phydev, PAGESEL, 0); val = phy_read(phydev, PHYCR2); if (on) |