From patchwork Tue Dec 27 16:24:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 9489657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 138E560838 for ; Tue, 27 Dec 2016 16:24:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 052CB1FF8F for ; Tue, 27 Dec 2016 16:24:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC3DB201BC; Tue, 27 Dec 2016 16:24:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 728441FF8F for ; Tue, 27 Dec 2016 16:24:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932984AbcL0QY0 (ORCPT ); Tue, 27 Dec 2016 11:24:26 -0500 Received: from mail-qk0-f196.google.com ([209.85.220.196]:35747 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932900AbcL0QYZ (ORCPT ); Tue, 27 Dec 2016 11:24:25 -0500 Received: by mail-qk0-f196.google.com with SMTP id u25so28767608qki.2 for ; Tue, 27 Dec 2016 08:24:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RvQP5KR3vz83MxOP8cnZxJZTy66tNK+lkgX+2MFgx4o=; b=LXrvYaXlO/8fILZ5l+HT4u6Xu9dbRjQV2cDu/dLVnkrujMUDKXUVgx2pWat08AFWMc 9hxQXFmrMioh9AFK3Ylk3sAgtkF36n1c2A/oSQp1oO7bwQ8/3qqOPhOx3Dscz5AkyUhI HozGBnTzXWveVnod5Go69h/jCM8gTFZKm1x8gZl2g/B2FDkpMYoP2YMJD33LaKhLDUsQ 5hRTPNMHHb/aQrk4wTJ9Wl89llCapkWgJRrOjpvLc3CyeYpAnAhL+ZiDiSQBBJ7lKL2f M+SbyT25sVS54RZbkbdQCO8UeMlqcM6YEM46YMupohgaCIRORzj8z590I+B2rbNwDx8o EkTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RvQP5KR3vz83MxOP8cnZxJZTy66tNK+lkgX+2MFgx4o=; b=kd8yk+1+aGm0tLlIZrrPEfB3CnqbnUZYniOAiPM62SbMPYMBWJczOr+5svCk4b6TDR a31RrxGBHudC3SMi+H8bi+/YbydieSfVZIY5a27FqdriWZyEElqWA0GLNzvPa0zax9BC Iz51iR491ZVYy8+f1l6upQ2KCX1sMEowQHiOdX3mtnCsQUI/qQNEhWBgWiAFRxKDXNE9 KtmQxTRA9joRLUDfLwlsMV97p7vSUrWXSflPn+QkT3fPg9E224nUO4CmtyUfBAS8PAHr zbRKqaBRiy+DacPtsSaZLEX2PjJLZd21x9ylogbErSHKqTNdnIntsuA5XcHnjKfjFruw aJUA== X-Gm-Message-State: AIkVDXK1ca304bJ1xRgiWHw9ZC5zoXu5knGVsPlcoLa4/m1YInNNYJEshzKT57On//VYow== X-Received: by 10.55.201.21 with SMTP id q21mr35026668qki.242.1482855864729; Tue, 27 Dec 2016 08:24:24 -0800 (PST) Received: from localhost.localdomain ([187.180.187.205]) by smtp.gmail.com with ESMTPSA id 33sm28823111qtq.1.2016.12.27.08.24.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Dec 2016 08:24:24 -0800 (PST) From: Fabio Estevam To: edubezval@gmail.com Cc: rui.zhang@intel.com, linux@roeck-us.net, linux-pm@vger.kernel.org, Fabio Estevam Subject: [PATCH] thermal: thermal_hwmon: Convert to hwmon_device_register_with_info() Date: Tue, 27 Dec 2016 14:24:12 -0200 Message-Id: <1482855852-26188-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam Booting Linux on a mx6q based board leads to the following warning: (NULL device *): hwmon_device_register() is deprecated. Please convert the driver to use hwmon_device_register_with_info(). ,so do as suggested. Also, this results in the core taking care of creating the 'name' attribute, so drop the code doing that from the thermal driver. Suggested-by: Guenter Roeck Signed-off-by: Fabio Estevam --- Changes since RFC: - Properly use hwmon_device_register_with_info() - Remove device_create_file() from the thermal driver as the hwmon core will take care of it drivers/thermal/thermal_hwmon.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c index 541af59..39d8a90 100644 --- a/drivers/thermal/thermal_hwmon.c +++ b/drivers/thermal/thermal_hwmon.c @@ -59,14 +59,6 @@ static LIST_HEAD(thermal_hwmon_list); static DEFINE_MUTEX(thermal_hwmon_list_lock); static ssize_t -name_show(struct device *dev, struct device_attribute *attr, char *buf) -{ - struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev); - return sprintf(buf, "%s\n", hwmon->type); -} -static DEVICE_ATTR_RO(name); - -static ssize_t temp_input_show(struct device *dev, struct device_attribute *attr, char *buf) { int temperature; @@ -165,15 +157,13 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) INIT_LIST_HEAD(&hwmon->tz_list); strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); - hwmon->device = hwmon_device_register(NULL); + hwmon->device = hwmon_device_register_with_info(NULL, hwmon->type, + hwmon, NULL, NULL); if (IS_ERR(hwmon->device)) { result = PTR_ERR(hwmon->device); goto free_mem; } dev_set_drvdata(hwmon->device, hwmon); - result = device_create_file(hwmon->device, &dev_attr_name); - if (result) - goto free_mem; register_sys_interface: temp = kzalloc(sizeof(*temp), GFP_KERNEL); @@ -222,10 +212,8 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) free_temp_mem: kfree(temp); unregister_name: - if (new_hwmon_device) { - device_remove_file(hwmon->device, &dev_attr_name); + if (new_hwmon_device) hwmon_device_unregister(hwmon->device); - } free_mem: if (new_hwmon_device) kfree(hwmon); @@ -267,7 +255,6 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz) list_del(&hwmon->node); mutex_unlock(&thermal_hwmon_list_lock); - device_remove_file(hwmon->device, &dev_attr_name); hwmon_device_unregister(hwmon->device); kfree(hwmon); }