From patchwork Thu Jan 28 21:57:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 372623 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp1638129jam; Thu, 28 Jan 2021 13:59:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzT338m4wzNoFTOVdI3ANekMgcELyuGc7iEuSGuGoIs+/vyY4FS4ChgDYePRfWbUq7T8qxN X-Received: by 2002:a17:907:d04:: with SMTP id gn4mr1584820ejc.126.1611871187212; Thu, 28 Jan 2021 13:59:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611871187; cv=none; d=google.com; s=arc-20160816; b=LB9H5hP+79FBJRu5xXPaTGyKRivR5UYS6er7HBzW0LGHmaAu0qY+4mfSvHxqtNwYCa riv5W+DDkLXwNlDZYonMGLsJjR002kNvZz1gio5u02WpOs9xaZA+fXt5buMMOzadxPyO Lt4FRH4nw3nk7yaeeQ3zuT6M/dqh4z/WFPvLxPVgjY6hN1RID7ztKXyddV32Qu3vuY3K awrun+D9IoFIcNPIKmyb6VWZ0gpCakP4urTq1gtEkB5lrHr8XIekp/q63/PPLk9iLHeY dlX45Iejuv/e58EvGbl6UG0yA1fNEyRriewmy33aCcK05txxLpl/l+G/MfLo5VGp3geD Jw+A== 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 :message-id:date:subject:cc:to:from; bh=oi+jj4jyM6o4x4t/G9Vfw4M3TkZ0bSPXjbhpoD8d3As=; b=U3z57cJk5BkoRA9VqsBIogOW1EcVsLxmRJlwPep7uiOngEHA5oRWahBVLOr1fBIDCX wnojFSCv/vmxKnf8gcTgHihTy2PqJcOixTMQ31MNZwvm/jL6heEQv4LDOR+GN9nZaIJz XTB6kcTuirTbAANrqWUltugMJjCZHMWKijFyH19kIzu/2rczeU7TTn/0LfteDAVAtZdm PCIWaZZPXk4WHIhfizBPjnIHPEpSWX7aaaMBoFx6FdHaTe57CwvMVFCLm05ZDUa9smWy 4eaumy4QjcpiHOSTMjF6kPDkCO+kWybicOfmwDtVhdl4Nb50l2k5xYMZTgLINfOOrZC0 GNZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s25si3507849ejz.751.2021.01.28.13.59.46; Thu, 28 Jan 2021 13:59:47 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229658AbhA1V60 (ORCPT + 6 others); Thu, 28 Jan 2021 16:58:26 -0500 Received: from mail-oi1-f170.google.com ([209.85.167.170]:33357 "EHLO mail-oi1-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229596AbhA1V6Z (ORCPT ); Thu, 28 Jan 2021 16:58:25 -0500 Received: by mail-oi1-f170.google.com with SMTP id j25so7762936oii.0; Thu, 28 Jan 2021 13:58:09 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=oi+jj4jyM6o4x4t/G9Vfw4M3TkZ0bSPXjbhpoD8d3As=; b=AXWA4czM6aY+3iEAEkWOweT+DsGAIWZTpK3v2c2igRJB4l0iVa8RgLH/xtOH1rQvO3 9FNne6ydrq5efJobXv1p/5IpD/n5uNxxRLru5WRk0pyUW+p0gdpb+CO1BGCQ5VYgLJ1k NCOL1/apadIrndfAzeLpP1PeAYH4yJ9am4o2xiiL4gIK3SfYdUwpFyEGpYmJ4JwG2vXf 76sR1QmxDWAlBC51LILolfVZgF+tamEW6vFA1eHFqjytc0lMzYShk7YNYFyvzUfIfMHf YXiWJU+7uI+RN8D1uHW+qx3Fe3hZirLMlAOgtRlSX6087WM6vIaPrKJiZ2EZlF43HXhW hXPQ== X-Gm-Message-State: AOAM5327KTzONpCSuihL1yF9bo82cWJrCX12CL/XbOxj6qNFLvouZEFK NmMMEDaHphdk4eOKP1h32hDtmyQZTw== X-Received: by 2002:aca:cc15:: with SMTP id c21mr877619oig.154.1611871064310; Thu, 28 Jan 2021 13:57:44 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id t16sm1312777otq.17.2021.01.28.13.57.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 13:57:43 -0800 (PST) From: Rob Herring To: Stephen Boyd , Guenter Roeck Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Arnd Bergmann , Geert Uytterhoeven , Jean Delvare , Rob Herring , Frank Rowand Subject: [PATCH v3] hwmon: (lm70) Use device_get_match_data() Date: Thu, 28 Jan 2021 15:57:42 -0600 Message-Id: <20210128215742.983036-1-robh@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Stephen Boyd Use the more modern API to get the match data out of the of match table. This saves some code, lines, and nicely avoids referencing the match table when it is undefined with configurations where CONFIG_OF=n. Signed-off-by: Stephen Boyd Cc: Arnd Bergmann Cc: Geert Uytterhoeven Cc: Jean Delvare Cc: Guenter Roeck Cc: Rob Herring Cc: Frank Rowand Cc: [robh: rework to use device_get_match_data()] Signed-off-by: Rob Herring --- v3: - Reworked to use device_get_match_data(). Lifted Stephen's commit message from another patch. :) Please ack and I'll add to the rest of the series. drivers/hwmon/lm70.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) -- 2.27.0 Acked-by: Guenter Roeck diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c index ae2b84263a44..40eab3349904 100644 --- a/drivers/hwmon/lm70.c +++ b/drivers/hwmon/lm70.c @@ -22,9 +22,9 @@ #include #include #include +#include #include #include -#include #include #define DRVNAME "lm70" @@ -173,25 +173,15 @@ MODULE_DEVICE_TABLE(acpi, lm70_acpi_ids); static int lm70_probe(struct spi_device *spi) { - const struct of_device_id *of_match; struct device *hwmon_dev; struct lm70 *p_lm70; int chip; - of_match = of_match_device(lm70_of_ids, &spi->dev); - if (of_match) - chip = (int)(uintptr_t)of_match->data; - else { -#ifdef CONFIG_ACPI - const struct acpi_device_id *acpi_match; + if (dev_fwnode(&spi->dev)) + chip = (int)(uintptr_t)device_get_match_data(&spi->dev); + else + chip = spi_get_device_id(spi)->driver_data; - acpi_match = acpi_match_device(lm70_acpi_ids, &spi->dev); - if (acpi_match) - chip = (int)(uintptr_t)acpi_match->driver_data; - else -#endif - chip = spi_get_device_id(spi)->driver_data; - } /* signaling is SPI_MODE_0 */ if (spi->mode & (SPI_CPOL | SPI_CPHA))