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=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 BBDF3C433DB for ; Tue, 2 Feb 2021 18:38:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 919BD64F6A for ; Tue, 2 Feb 2021 18:38:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238737AbhBBSio (ORCPT ); Tue, 2 Feb 2021 13:38:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238631AbhBBSh2 (ORCPT ); Tue, 2 Feb 2021 13:37:28 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68DDEC06174A for ; Tue, 2 Feb 2021 10:36:48 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id y205so14934259pfc.5 for ; Tue, 02 Feb 2021 10:36:48 -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=93B1hwUGpTMtS5SZqP8BFl4z4pGXcZ5Af5eOCl6zLTI=; b=nWFea0wTnaFq+z7Lcc4SZugVgpWGvP+yAdzXf/Ibm6IoU38mc/3LLoXHjvutxpyK6H LVeQVZEUGpnhfKSbWnwMDOlQX8OGK2XrKLmHMv2goN7/r+PAeEn2BKjFwTl9kxM5m/ce UnC0t6u8xQSds8Cwo6WbXzpAGgXmt9QtFjv6o= 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=93B1hwUGpTMtS5SZqP8BFl4z4pGXcZ5Af5eOCl6zLTI=; b=tZK3h0PvBuIsTBSnlZKyp1WI21eWUL8HKNBCBhMNM8RjYb8gRA/lT/qUeUmgShiyYA uAJxX+pkJBfmRcDOmWZYVdcj1DKU+0dp0Ny3DbQDBMM/f5h4NMCh+SvlUp1Eu+zBrwvf nlz1XfYV9u2aveW47sSUsBtyYe5rqIMvlz02gN6ni7RuSifeYx7tlmnJ7VILBx7d4fSC nnjt5lYsObCjabX/rU/5yVNcfyHZxCpfXceovlVODpJflM5Z261IEXFcPAzFN/b7tbco hXTZ7Qz4mz2TESFZrbeEbc9eWHrCH23ezeX5StV4wo6p9LSUJj25/05st9/SE85GFj2N iigg== X-Gm-Message-State: AOAM530EPHKMy8atQJqX0Gxa/nfp0Bf2H2aNEHK5i3NGjIZqGgUr9E3R XhEjtaV/C5j6Km8eBSh2J0gO9A== X-Google-Smtp-Source: ABdhPJx4cyLCDGVzd8QBXVdWMTSEG++Arft38UUmG7ky+whsyp/Cgtks2SZGoRJfWnqblrJCxoHJhw== X-Received: by 2002:a63:ce4a:: with SMTP id r10mr10177872pgi.3.1612291008025; Tue, 02 Feb 2021 10:36:48 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:201:3571:bd6e:ee19:b59f]) by smtp.gmail.com with ESMTPSA id c204sm21781994pfc.152.2021.02.02.10.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 10:36:47 -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 for-next] ASoC: da7218: Drop CONFIG_OF ifdef Date: Tue, 2 Feb 2021 10:36:46 -0800 Message-Id: <20210202183646.38602-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 Cc: Arnd Bergmann Cc: Mark Brown Signed-off-by: Stephen Boyd --- Please ack so Rob can take through DT tree. sound/soc/codecs/da7218.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 2bfafbe9e3dc..6d78bccb55c3 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) { base-commit: 19c329f6808995b142b3966301f217c831e7cf31 -- https://chromeos.dev