From patchwork Thu Jul 5 16:04:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10509779 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 9C614600F5 for ; Thu, 5 Jul 2018 16:07:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BB0528ECA for ; Thu, 5 Jul 2018 16:07:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F6E128EF8; Thu, 5 Jul 2018 16:07:00 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 25E2728ECA for ; Thu, 5 Jul 2018 16:07:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754400AbeGEQG6 (ORCPT ); Thu, 5 Jul 2018 12:06:58 -0400 Received: from mail.bootlin.com ([62.4.15.54]:58854 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932075AbeGEQGz (ORCPT ); Thu, 5 Jul 2018 12:06:55 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 2695C20935; Thu, 5 Jul 2018 18:06:53 +0200 (CEST) Received: from localhost.localdomain (AAubervilliers-681-1-39-106.w90-88.abo.wanadoo.fr [90.88.158.106]) by mail.bootlin.com (Postfix) with ESMTPSA id 3CE9920875; Thu, 5 Jul 2018 18:04:42 +0200 (CEST) From: Miquel Raynal To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Zhang Rui , Eduardo Valentin Cc: Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , Antoine Tenart , Maxime Chevallier , Nadav Haklai , David Sniatkiwicz , Baruch Siach , Miquel Raynal Subject: [PATCH v3 12/23] thermal: armada: get rid of the ->is_valid() pointer Date: Thu, 5 Jul 2018 18:04:26 +0200 Message-Id: <20180705160437.12325-13-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180705160437.12325-1-miquel.raynal@bootlin.com> References: <20180705160437.12325-1-miquel.raynal@bootlin.com> 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 The implementation of armada_is_valid() is very simple and is the same across all the versions of the IP since the ->is_valid_bit has been introduced. Simplify the structure by getting rid of the function pointer and calling directly the function. Signed-off-by: Miquel Raynal --- drivers/thermal/armada_thermal.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 7f8185e5816e..a05ec01d6848 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -82,9 +82,6 @@ struct armada_thermal_data { void (*init)(struct platform_device *pdev, struct armada_thermal_priv *priv); - /* Test for a valid sensor value (optional) */ - bool (*is_valid)(struct armada_thermal_priv *); - /* Formula coeficients: temp = (b - m * reg) / div */ s64 coef_b; s64 coef_m; @@ -266,6 +263,9 @@ static bool armada_is_valid(struct armada_thermal_priv *priv) { u32 reg; + if (!priv->data->is_valid_bit) + return true; + regmap_read(priv->syscon, priv->data->syscon_status_off, ®); return reg & priv->data->is_valid_bit; @@ -356,7 +356,7 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal, int ret; /* Valid check */ - if (priv->data->is_valid && !priv->data->is_valid(priv)) { + if (armada_is_valid(priv)) { dev_err(priv->dev, "Temperature sensor reading not valid\n"); return -EIO; @@ -410,7 +410,6 @@ static const struct armada_thermal_data armadaxp_data = { }; static const struct armada_thermal_data armada370_data = { - .is_valid = armada_is_valid, .init = armada370_init, .is_valid_bit = BIT(9), .temp_shift = 10, @@ -423,7 +422,6 @@ static const struct armada_thermal_data armada370_data = { }; static const struct armada_thermal_data armada375_data = { - .is_valid = armada_is_valid, .init = armada375_init, .is_valid_bit = BIT(10), .temp_shift = 0, @@ -437,7 +435,6 @@ static const struct armada_thermal_data armada375_data = { }; static const struct armada_thermal_data armada380_data = { - .is_valid = armada_is_valid, .init = armada380_init, .is_valid_bit = BIT(10), .temp_shift = 0, @@ -452,7 +449,6 @@ static const struct armada_thermal_data armada380_data = { }; static const struct armada_thermal_data armada_ap806_data = { - .is_valid = armada_is_valid, .init = armada_ap806_init, .is_valid_bit = BIT(16), .temp_shift = 0, @@ -469,7 +465,6 @@ static const struct armada_thermal_data armada_ap806_data = { }; static const struct armada_thermal_data armada_cp110_data = { - .is_valid = armada_is_valid, .init = armada_cp110_init, .is_valid_bit = BIT(10), .temp_shift = 0,