From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07EBCC47082 for ; Wed, 26 May 2021 12:50:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D889D6124B for ; Wed, 26 May 2021 12:50:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234787AbhEZMvm (ORCPT ); Wed, 26 May 2021 08:51:42 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:56862 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234862AbhEZMs5 (ORCPT ); Wed, 26 May 2021 08:48:57 -0400 Received: from mail-ua1-f69.google.com ([209.85.222.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1llswX-0000vL-AO for linux-kernel@vger.kernel.org; Wed, 26 May 2021 12:47:25 +0000 Received: by mail-ua1-f69.google.com with SMTP id r4-20020ab070c40000b02902064b454facso718948ual.6 for ; Wed, 26 May 2021 05:47:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lxlGt7UdLo9WhBrHrUnAMYLEvzBvX/vS3VzoKn9EqgQ=; b=pXY1ioIHCB8uN2EhxHknNbDcHL8vb0nhNfhcakY9ByFI/fISmzCPCmoYVF7yLKnP+f E7dDIAXxbJ1pSjQrxIeJmv0inC/tUgQhDKSZIx50ZB8tYcUwS+b2LvBDoVmdY/mIUSQ/ nfsSiUnCD5EQYKH6DLGHbsC6qzM06LhDIggqYPdc7/40HmtjTMgY3Cq+fbgMvsCGQlX0 1PBeraHZYjbvEgXzeaNHV0lRaUzZA+/y907e9tzj9wUO7q1mJznZGbquNguaBeiig36r gX1rXbFxNRpmUrdMVeMzjC3uoOv+1GvuvtHb7mm2kmJq5l5dRlSsi46pO2cd5xauPFQJ 2Izw== X-Gm-Message-State: AOAM5320+g7GNotzrsAXuHoKUmTIojthiFOCZDT/Ti6TjmmMETvCh3LG U69JSLxMvplzoVChID1azlHIYtqJpmfhJqO01Wm1xiR0a6+LKZL5qii+GCLknU78JbxNOhBdk+x 7lgKArBm8IHe+poVCfGNtxBCEfFeZPPwtMCLBypk0MQ== X-Received: by 2002:a05:6122:c91:: with SMTP id ba17mr27607459vkb.8.1622033244396; Wed, 26 May 2021 05:47:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeHUz3scp7cdtBDvx3wZhYQgy/hPyyOLqDEXP9LcACOUFA0w4nitE9VfR17c6NvL1vm1QT3w== X-Received: by 2002:a05:6122:c91:: with SMTP id ba17mr27607437vkb.8.1622033244233; Wed, 26 May 2021 05:47:24 -0700 (PDT) Received: from localhost.localdomain ([45.237.48.3]) by smtp.gmail.com with ESMTPSA id c126sm875817vkh.47.2021.05.26.05.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 05:47:23 -0700 (PDT) From: Krzysztof Kozlowski To: Lee Jones , Support Opensource , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Tony Lindgren , linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org, patches@opensource.cirrus.com Subject: [RESEND PATCH v2 02/13] mfd: max8998: Simplify getting of_device_id match data Date: Wed, 26 May 2021 08:47:00 -0400 Message-Id: <20210526124711.33223-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210526124711.33223-1-krzysztof.kozlowski@canonical.com> References: <20210526124711.33223-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use of_device_get_match_data() to make the code slightly smaller. There is also no need to wrap it in a check for CONFIG_OF, because dev.of_node will be set only with OF support. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. Remove check for CONFIG_OF --- drivers/mfd/max8998.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 785f8e9841b7..0eb15e611b67 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -155,11 +156,8 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata( static inline unsigned long max8998_i2c_get_driver_data(struct i2c_client *i2c, const struct i2c_device_id *id) { - if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) { - const struct of_device_id *match; - match = of_match_node(max8998_dt_match, i2c->dev.of_node); - return (unsigned long)match->data; - } + if (i2c->dev.of_node) + return (unsigned long)of_device_get_match_data(&i2c->dev); return id->driver_data; } -- 2.27.0