[PATCH net] net: dsa: Mop up remaining NET_DSA_HWMON references

[PATCH net] net: dsa: Mop up remaining NET_DSA_HWMON references

[Andrew Lunn]

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>
---
 Documentation/networking/dsa/dsa.txt | 24 ------------------------
 include/net/dsa.h                    |  8 --------
 2 files changed, 32 deletions(-)

diff --git a/Documentation/networking/dsa/dsa.txt b/Documentation/networking/dsa/dsa.txt
index 63912ef34606..b8b40753133e 100644
--- a/Documentation/networking/dsa/dsa.txt
+++ b/Documentation/networking/dsa/dsa.txt
@@ -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
 ----------------
@@ -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
 ==================
 
@@ -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
 ------------
 
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 9d6cd923c48c..08b340403927 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -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
 	 */
-- 
2.11.0

Re: [PATCH net] net: dsa: Mop up remaining NET_DSA_HWMON references

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 3081 bytes --]

Hi Andrew,

[auto build test ERROR on net/master]

url:    https://github.com/0day-ci/linux/commits/Andrew-Lunn/net-dsa-Mop-up-remaining-NET_DSA_HWMON-references/20170125-221411
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   net/dsa/dsa.c: In function 'dsa_switch_setup_one':
>> net/dsa/dsa.c:447:15: error: 'struct dsa_switch' has no member named 'hwmon_name'
      scnprintf(ds->hwmon_name, sizeof(ds->hwmon_name), "%s_dsa%d",
                  ^~
   net/dsa/dsa.c:447:38: error: 'struct dsa_switch' has no member named 'hwmon_name'
      scnprintf(ds->hwmon_name, sizeof(ds->hwmon_name), "%s_dsa%d",
                                         ^~
>> net/dsa/dsa.c:449:5: error: 'struct dsa_switch' has no member named 'hwmon_dev'
      ds->hwmon_dev = hwmon_device_register_with_groups(NULL,
        ^~
   net/dsa/dsa.c:450:8: error: 'struct dsa_switch' has no member named 'hwmon_name'
         ds->hwmon_name, ds, dsa_hwmon_groups);
           ^~
   net/dsa/dsa.c:451:16: error: 'struct dsa_switch' has no member named 'hwmon_dev'
      if (IS_ERR(ds->hwmon_dev))
                   ^~
   net/dsa/dsa.c:452:6: error: 'struct dsa_switch' has no member named 'hwmon_dev'
       ds->hwmon_dev = NULL;
         ^~
   net/dsa/dsa.c: In function 'dsa_switch_destroy':
   net/dsa/dsa.c:518:8: error: 'struct dsa_switch' has no member named 'hwmon_dev'
     if (ds->hwmon_dev)
           ^~
   net/dsa/dsa.c:519:29: error: 'struct dsa_switch' has no member named 'hwmon_dev'
      hwmon_device_unregister(ds->hwmon_dev);
                                ^~

vim +447 net/dsa/dsa.c

51579c3f Guenter Roeck 2014-10-29  441  		/* Create valid hwmon 'name' attribute */
51579c3f Guenter Roeck 2014-10-29  442  		for (i = j = 0; i < IFNAMSIZ && netname[i]; i++) {
51579c3f Guenter Roeck 2014-10-29  443  			if (isalnum(netname[i]))
51579c3f Guenter Roeck 2014-10-29  444  				hname[j++] = netname[i];
51579c3f Guenter Roeck 2014-10-29  445  		}
51579c3f Guenter Roeck 2014-10-29  446  		hname[j] = '\0';
51579c3f Guenter Roeck 2014-10-29 @447  		scnprintf(ds->hwmon_name, sizeof(ds->hwmon_name), "%s_dsa%d",
51579c3f Guenter Roeck 2014-10-29  448  			  hname, index);
51579c3f Guenter Roeck 2014-10-29 @449  		ds->hwmon_dev = hwmon_device_register_with_groups(NULL,
51579c3f Guenter Roeck 2014-10-29  450  					ds->hwmon_name, ds, dsa_hwmon_groups);
51579c3f Guenter Roeck 2014-10-29  451  		if (IS_ERR(ds->hwmon_dev))
51579c3f Guenter Roeck 2014-10-29  452  			ds->hwmon_dev = NULL;

:::::: The code at line 447 was first introduced by commit
:::::: 51579c3f1a9192b75365576227d40c7619493285 net: dsa: Add support for reporting switch chip temperatures

:::::: TO: Guenter Roeck <linux@roeck-us.net>
:::::: CC: David S. Miller <davem@davemloft.net>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 57926 bytes --]

Re: [PATCH net] net: dsa: Mop up remaining NET_DSA_HWMON references

[Andrew Lunn]

On Wed, Jan 25, 2017 at 03:04:17PM +0100, Andrew Lunn wrote:
> 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.

Hi David

Wrong subject line. This should be net-next, which is why 0-day has
found issues. It applied it to the wrong branch.

      Andrew

Re: [PATCH net] net: dsa: Mop up remaining NET_DSA_HWMON references

[David Miller]

From: Andrew Lunn <andrew@lunn.ch>
Date: Wed, 25 Jan 2017 15:04:17 +0100

> 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>

Applied to... net-next :-)