From patchwork Mon Nov 27 13:16:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 170135 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3101364vqx; Mon, 27 Nov 2023 05:18:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IE1AdokoozXlt1i6VepSIzGZdFmuTnXSYJ4hAwIoURIJTQRIR5jC+nymm6BUpmovY8P1nNg X-Received: by 2002:a92:c26b:0:b0:35c:d832:5d58 with SMTP id h11-20020a92c26b000000b0035cd8325d58mr3331446ild.17.1701091090763; Mon, 27 Nov 2023 05:18:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701091090; cv=none; d=google.com; s=arc-20160816; b=gcgsLY3heNBG1IQEQs0bS/JXytPfPN4w+pWuvKAsriJOhDOXTfX/bCL5kWBBVUhHJB 7rlYaC4MRXctVikLZLBVjukKhRcINb9/eniZRF3C/d3bScwiAbL1q2Az0izq/r3bWlwD r/k5Sf1RM5ueIpY8zmwNRHT9hR8Kx6m8NWMc2lC21O3cUCBQxYS7AA/pGYeqzCFbaGDe VnWeODXf+TTzxRTRx1xQlokR1gN+EG9n26ZMLzOTHwXDLs63pD2AENEFC+du7yvRTect 9spWiaX153nbvsP7Mjn8ZlLfLepPzeBJ4g++5L7T3KGDi62wd2LDnVhM4jeZLO15KRxS z+kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t+1cdv5TxpBJ1GjKW4zpovfXCpAiFX2g6v/ZIrPq+00=; fh=Mbam0pR9JWUnI2UheCn8N0H+ykbrnMeiPzCxF+zJmn8=; b=z+p3+fpwf2PGMKHEEgMoNIsUKZDT/14sKaZpPI5C/4CxPO2m6TmnE2ubtC0Y78YKeq P+4p2pZeBdcqtKDkql8GFdYVBN9XXg9sdp6IcczkqHMjjF9O3D6ng1tJdkEWGzhXqwRs J/SJJwmv5CqmAoLeQuQdVXhSXTD5C7OcrVOeh82/MOkdqOGcVLQ9ZTqWU2TWWZUtG0Uw ghn2z7h+JHNCvmFmci+fUlZWptIcOzQmgtRzi59aq8dqA09486lLSNkBqNonXslldWwr 4NusqtDbl5q1nm6Dc5eMG7dawhzNZLT4vaGctqyMDcxVYhtzx4uFqOxUAb/5kq02lYx9 GvvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=W8biN+dx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id l68-20020a632547000000b005b9066580d1si9478755pgl.754.2023.11.27.05.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 05:18:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=W8biN+dx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 1DF7E804C6D0; Mon, 27 Nov 2023 05:17:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233476AbjK0NRJ (ORCPT + 99 others); Mon, 27 Nov 2023 08:17:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233468AbjK0NRH (ORCPT ); Mon, 27 Nov 2023 08:17:07 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F9A4189; Mon, 27 Nov 2023 05:17:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701091033; x=1732627033; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jPe+mAbPpnyNZkTqYzOt88Czcd9OZNWfQMy+IPturg4=; b=W8biN+dxmHzU878PhrqG2u/pYVqA3uzFhkBUaZRzyGeR5Wo5SPARnJLN HCjaWZja8lgHG0+4RKIzXQuGLTwNXKG2Ozqv6OQKzHqC8EnD/az1GxvMR OpRIb162rf6/+lB+dUktHVzlPMVxC1kgJyE5MoTie5Dap0X2RL52Imp2E APC/UIKWs/Wg5xi3kdmCivnsHXenpAT6ESGZ+7iTx/Ewc63WF/EMbteMJ vkE1/O9HVTF8g7goE2w2kMF+oQ5XRkbIvku8+hsAtAGhyWrVpIMSKTgkT xDW8Lwyi/kPSneplcISsL7C5WNS0qfOfu0/MQiDq8yKV2KZfIPmyIbfCv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10906"; a="423833679" X-IronPort-AV: E=Sophos;i="6.04,230,1695711600"; d="scan'208";a="423833679" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 05:17:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10906"; a="718031612" X-IronPort-AV: E=Sophos;i="6.04,230,1695711600"; d="scan'208";a="718031612" Received: from zhipengw-mobl1.ccr.corp.intel.com (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.255.29.237]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 05:17:10 -0800 From: Zhang Rui To: linux@roeck-us.net, jdelvare@suse.com Cc: fenghua.yu@intel.com, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] hwmon: (coretemp) Remove unnecessary dependency of array index Date: Mon, 27 Nov 2023 21:16:50 +0800 Message-Id: <20231127131651.476795-3-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127131651.476795-1-rui.zhang@intel.com> References: <20231127131651.476795-1-rui.zhang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 27 Nov 2023 05:17:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783723291605533988 X-GMAIL-MSGID: 1783723291605533988 When sensor_device_attribute pointer is available, use container_of() to get the temp_data address. This removes the unnecessary dependency of cached index in pdata->core_data[]. Signed-off-by: Zhang Rui --- drivers/hwmon/coretemp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 6053ed3761c2..cef43fedbd58 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -342,7 +342,7 @@ static ssize_t show_label(struct device *dev, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_LABEL]); if (tdata->is_pkg_data) return sprintf(buf, "Package id %u\n", pdata->pkg_id); @@ -355,8 +355,7 @@ static ssize_t show_crit_alarm(struct device *dev, { u32 eax, edx; struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_CRIT_ALARM]); mutex_lock(&tdata->update_lock); rdmsr_on_cpu(tdata->cpu, tdata->status_reg, &eax, &edx); @@ -369,8 +368,7 @@ static ssize_t show_tjmax(struct device *dev, struct device_attribute *devattr, char *buf) { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TJMAX]); int tjmax; mutex_lock(&tdata->update_lock); @@ -384,8 +382,7 @@ static ssize_t show_ttarget(struct device *dev, struct device_attribute *devattr, char *buf) { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TTARGET]); int ttarget; mutex_lock(&tdata->update_lock); @@ -402,8 +399,7 @@ static ssize_t show_temp(struct device *dev, { u32 eax, edx; struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct platform_data *pdata = dev_get_drvdata(dev); - struct temp_data *tdata = pdata->core_data[attr->index]; + struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TEMP]); int tjmax; mutex_lock(&tdata->update_lock); @@ -445,7 +441,6 @@ static int create_core_attrs(struct temp_data *tdata, struct device *dev, tdata->sd_attrs[i].dev_attr.attr.name = tdata->attr_name[i]; tdata->sd_attrs[i].dev_attr.attr.mode = 0444; tdata->sd_attrs[i].dev_attr.show = rd_ptr[i]; - tdata->sd_attrs[i].index = attr_no; tdata->attrs[i] = &tdata->sd_attrs[i].dev_attr.attr; } tdata->attr_group.attrs = tdata->attrs;