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=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 0D703C433E0 for ; Tue, 2 Feb 2021 19:23:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD41A64E49 for ; Tue, 2 Feb 2021 19:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239172AbhBBTWo (ORCPT ); Tue, 2 Feb 2021 14:22:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238091AbhBBTU6 (ORCPT ); Tue, 2 Feb 2021 14:20:58 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 533B5C061797 for ; Tue, 2 Feb 2021 11:20:18 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id x9so7134623plb.5 for ; Tue, 02 Feb 2021 11:20:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=e+o+UPWpwuQFchtTrrp1JQI9+CBVVq/LhzPVdVc1GWg=; b=Fo1uLKa8TGSxAVjitKCWihEfFzuubLqrYHqw/h3YjGnPCzUWe8vEE7T/Re5UQqAf1b ZHlN1/yMwj7ltvrkM4Uky+LfcTv61BzZNMI2LU6KW4TepwThtGuCaEljJPs0y6hgdfHt qRDhv1liTKeTBlTOVwTJm2DpWA4ZUFKJqZ1qY= 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=e+o+UPWpwuQFchtTrrp1JQI9+CBVVq/LhzPVdVc1GWg=; b=I23+zJ2GkCI6vW2vl2f7hNB3tUunlv8WX/kLq1DEpre2m77goXIqXSmhTNxbToV/ZA cCKFlV/Iww6GJYMBlKc+0w3HUTtFrH7h4Vi5gY7vHVFIkaLW/6SFQj/0k/t5vBqG4BhT sVlGWAex63xeQ+Pu6MFmk5OciYPOyLRAli7r/PuGcdOVW59Uqn2ShE9CDAI8fOd4cQ3a QtkstWP0M4wFUwpGPGG7fHNUFfY12ZKlHygD1sXdOiwyY7TIYFeJiqrt5bd3arBby0He 1AaX874FYNFWzXeXhpSVunFuzKqss2VP5avWO7zON4mYg+5bEpPPsIbZxR5gqhDGWhvT FU+w== X-Gm-Message-State: AOAM530n0URhB6Jae1CGh4CC4TZLu1ap5DI8I+zInJsVr45b3u2RFxYp CmqR7b5tm1n5W+5oMDEvqAmtxA== X-Google-Smtp-Source: ABdhPJwYbFUIfvuxMuXkupVzK2EaOdtzLPGXYdKLXO/1XSCSp6d0rN+Sp43BtE5oXH7uLwxbMR/HWA== X-Received: by 2002:a17:90b:4d07:: with SMTP id mw7mr5902885pjb.172.1612293617890; Tue, 02 Feb 2021 11:20:17 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:201:3571:bd6e:ee19:b59f]) by smtp.gmail.com with ESMTPSA id r5sm22095076pfl.165.2021.02.02.11.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 11:20:17 -0800 (PST) From: Stephen Boyd To: Rob Herring Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kernel test robot , Geert Uytterhoeven , Arnd Bergmann , Mark Brown Subject: [PATCH v2] ASoC: da7218: Drop CONFIG_OF ifdef Date: Tue, 2 Feb 2021 11:20:16 -0800 Message-Id: <20210202192016.49028-1-swboyd@chromium.org> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit a06cd8cf97a3 ("ASoC: da7218: skip of_device_id table when !CONFIG_OF") because we want to make of_match_device() stop using of_match_ptr() internally, confusing compilers and causing ifdef pollution. Reported-by: kernel test robot Cc: Geert Uytterhoeven Acked-by: Arnd Bergmann Cc: Mark Brown Signed-off-by: Stephen Boyd --- Changes from v1: * Dropped of_match_ptr() in driver too sound/soc/codecs/da7218.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 2bfafbe9e3dc..83cace9d0139 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -2278,14 +2278,12 @@ static irqreturn_t da7218_irq_thread(int irq, void *data) * DT */ -#ifdef CONFIG_OF static const struct of_device_id da7218_of_match[] = { { .compatible = "dlg,da7217", .data = (void *) DA7217_DEV_ID }, { .compatible = "dlg,da7218", .data = (void *) DA7218_DEV_ID }, { } }; MODULE_DEVICE_TABLE(of, da7218_of_match); -#endif static inline int da7218_of_get_id(struct device *dev) { @@ -3311,7 +3309,7 @@ MODULE_DEVICE_TABLE(i2c, da7218_i2c_id); static struct i2c_driver da7218_i2c_driver = { .driver = { .name = "da7218", - .of_match_table = of_match_ptr(da7218_of_match), + .of_match_table = da7218_of_match, }, .probe = da7218_i2c_probe, .id_table = da7218_i2c_id, base-commit: 19c329f6808995b142b3966301f217c831e7cf31 -- https://chromeos.dev