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 83643C47089 for ; Wed, 26 May 2021 12:49:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B56B613F5 for ; Wed, 26 May 2021 12:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234833AbhEZMuw (ORCPT ); Wed, 26 May 2021 08:50:52 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:56854 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234860AbhEZMs4 (ORCPT ); Wed, 26 May 2021 08:48:56 -0400 Received: from mail-vs1-f70.google.com ([209.85.217.70]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1llswV-0000uf-Ug for linux-kernel@vger.kernel.org; Wed, 26 May 2021 12:47:24 +0000 Received: by mail-vs1-f70.google.com with SMTP id a25-20020a0561020159b029024067c780c1so192897vsr.20 for ; Wed, 26 May 2021 05:47:23 -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=63wtLBW+6811tc2wM3xGC8HMgV4U9MLtscg3Brvx6/I=; b=bK2Ohcs+d1dI+qKT8x4wqPspaCN2jJdyyneUuQ0vDf8ye2rwGLanEehlXfVqWG0tnG KnBVFvZkk9cN5RJooQhH2HT/HGVJYJeUr9znZoDtiynfBAytb7G2uMZ/r5sLK+/pTG5M t5arQaIibtLQTOgI634NcjFXgVth5vKzMbE5ifEAMya2xTThCP1pMN01JZuvBsbZmAGn 9Pui6KWi/vCbPXUc1hioGS6KkK9oGuContTwUWIYI7KqJXRRpQVR6rMIzZrgzDrqwBN2 +Jg2PpcoH4ld4lrz1/dGqpKHWvFRQAMAcjglSYK9E54jAeOMPruB/NaFgopt0vUd/k3L w4Dw== X-Gm-Message-State: AOAM531na1uGQAbVvr6XgSWrzToID3q9iQCO3K4pL0ucPShxoCsPOkmu RNxrtiur+84+zxFkIevr0g8QP+FXXngr9Bei8iGjTc427OMndXzYIrZElhmx+LjWop0S32uXtE3 uIPl5cp/PEWKnqcYv2fZGz3hZ9FUohxlusKZ0UZ0gSQ== X-Received: by 2002:a1f:eec6:: with SMTP id m189mr28997975vkh.5.1622033242689; Wed, 26 May 2021 05:47:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGXY4h0rmF++o4wqDou76qRmdKHAt/W8UvAFVzu+jFZ3c1eLygDNepjjkFiySFdPpaAvkZPQ== X-Received: by 2002:a1f:eec6:: with SMTP id m189mr28997924vkh.5.1622033242172; Wed, 26 May 2021 05:47:22 -0700 (PDT) Received: from localhost.localdomain ([45.237.48.3]) by smtp.gmail.com with ESMTPSA id c126sm875817vkh.47.2021.05.26.05.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 05:47:21 -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 01/13] mfd: max8997: Simplify getting of_device_id match data Date: Wed, 26 May 2021 08:46:59 -0400 Message-Id: <20210526124711.33223-2-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/max8997.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index 68d8f2b95287..2141de78115d 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -145,11 +146,9 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( static inline unsigned long max8997_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(max8997_pmic_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