Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754641AbbDPSi4 (ORCPT ); Thu, 16 Apr 2015 14:38:56 -0400 Received: from mail.savoirfairelinux.com ([209.172.62.77]:57731 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754424AbbDPSik (ORCPT ); Thu, 16 Apr 2015 14:38:40 -0400 From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Vivien Didelot , "David S. Miller" , Guenter Roeck , Florian Fainelli , kernel@savoirfairelinux.com Subject: [PATCH 2/2] net: dsa: register hwmon for any provided function Date: Thu, 16 Apr 2015 14:38:19 -0400 Message-Id: <1429209499-2447-2-git-send-email-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1429209499-2447-1-git-send-email-vivien.didelot@savoirfairelinux.com> References: <1429209499-2447-1-git-send-email-vivien.didelot@savoirfairelinux.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1473 Lines: 44 A switch driver may only provide one of the temperature limit accessors, or the temperature alarm getter. So register the hwmon subsystem if any of the related functions is provided. Thus, check get_temp to set the visibility of temp1_input. Signed-off-by: Vivien Didelot --- net/dsa/dsa.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 67d2983..6b68994 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -157,6 +157,10 @@ static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj, umode_t mode = 0; switch (index) { + case 0: /* temp1_input */ + if (drv->get_temp) + mode |= S_IRUGO; + break; case 1: /* temp1_max */ if (drv->get_temp_limit) mode |= S_IRUGO; @@ -310,7 +314,8 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent) * register with hardware monitoring subsystem. * Treat registration error as non-fatal and ignore it. */ - if (drv->get_temp) { + if (drv->get_temp || drv->get_temp_limit || drv->set_temp_limit || + drv->get_temp_alarm) { const char *netname = netdev_name(dst->master_netdev); char hname[IFNAMSIZ + 1]; int i, j; -- 2.3.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/