Skip to content

Commit

Permalink
net: dsa: Mop up remaining NET_DSA_HWMON references
Browse files Browse the repository at this point in the history
Previous patches have moved the temperature sensor code into the
Marvell PHYs. A few now dead references to NET_DSA_HWMON were left
behind. Go reap them.

Reported-by: Valentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andrew Lunn authored and David S. Miller committed Jan 25, 2017
1 parent 6eacfb5 commit 4345029
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 32 deletions.
24 changes: 0 additions & 24 deletions Documentation/networking/dsa/dsa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ DSA currently leverages the following subsystems:
- MDIO/PHY library: drivers/net/phy/phy.c, mdio_bus.c
- Switchdev: net/switchdev/*
- Device Tree for various of_* functions
- HWMON: drivers/hwmon/*

MDIO/PHY library
----------------
Expand Down Expand Up @@ -349,12 +348,6 @@ Documentation/devicetree/bindings/net/dsa/dsa.txt. PHY/MDIO library helper
functions such as of_get_phy_mode(), of_phy_connect() are also used to query
per-port PHY specific details: interface connection, MDIO bus location etc..

HWMON
-----

Some switch drivers feature internal temperature sensors which are exposed as
regular HWMON devices in /sys/class/hwmon/.

Driver development
==================

Expand Down Expand Up @@ -495,23 +488,6 @@ Power management
BR_STATE_DISABLED and propagating changes to the hardware if this port is
disabled while being a bridge member

Hardware monitoring
-------------------

These callbacks are only available if CONFIG_NET_DSA_HWMON is enabled:

- get_temp: this function queries the given switch for its temperature

- get_temp_limit: this function returns the switch current maximum temperature
limit

- set_temp_limit: this function configures the maximum temperature limit allowed

- get_temp_alarm: this function returns the critical temperature threshold
returning an alarm notification

See Documentation/hwmon/sysfs-interface for details.

Bridge layer
------------

Expand Down
8 changes: 0 additions & 8 deletions include/net/dsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,6 @@ struct dsa_switch {
*/
s8 rtable[DSA_MAX_SWITCHES];

#ifdef CONFIG_NET_DSA_HWMON
/*
* Hardware monitoring information
*/
char hwmon_name[IFNAMSIZ + 8];
struct device *hwmon_dev;
#endif

/*
* The lower device this switch uses to talk to the host
*/
Expand Down

0 comments on commit 4345029

Please sign in to comment.