From patchwork Fri Oct 6 20:09:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 149389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp570183vqo; Fri, 6 Oct 2023 13:10:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1MnhWARSNR2CFzffnTOf3keVIN7vUftXAM9Fq+vVxMdFz0+ZMVmlBL0QvI777bHmaFYyW X-Received: by 2002:a17:902:724a:b0:1bb:3979:d467 with SMTP id c10-20020a170902724a00b001bb3979d467mr8386441pll.63.1696623018774; Fri, 06 Oct 2023 13:10:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696623018; cv=none; d=google.com; s=arc-20160816; b=MEHpNh9Dna782ffiKTZ7rFU9jEg4SMv9WUn/amZLEX3K6Z3soRgCPCTtfcHC8abWCO ckuDymp3CmknGbcCO4MjSicI54CvUU6z6qyniKHI3LbY2brtyp1Su31vj6LMCZOySbpC Lw6eeCQA6Hdv9Zy3QnXwJ+3ATuvY+lN/91tDsHSGfX/psYWwK1W9zAfBM9ZI2eIPovOR Zzi1x26eXaLL663Dz5RsHKc7WpRpIG+yPkqSlENBbc2qfrjI/1x0bgSp8mb2OqfSGFAX NiRlIljcncqsJiOCowq8eN7XjdlPzuoRXHaliZy67aXywffEGznYqryq1+6xegJqfi9g AYUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=A+OCongk6Hb4BlpU4QfeNnEcgzo8GaBxo0N0PgFWYnw=; fh=IJ32rODLot8WzKyM5hJwYaHKfXI1FHqM5tEDV9+u21c=; b=eft6ukElU7mntvdIMeGi+Z99ZKgvV10GTz07phul1U5VLeqSCxegGt6RAWC+k2ge40 t1TlrJMLWqiGbQoxtmbwz9mHP40I3UJVcRlGo1t4/Rtuf+yRxQ2I6Msn0F5/O0eUb6hg I5NCesoPBvVB2052WS01naoeDVSEV8yfsSH6UlY9N5iUUW8TL2OFFv/XTUnbw86momLx lV6Ii/pxZ89iSBLPhTI0fGOIqADuYMisLwERiruLV19v0m6ayVoa+mFwmYVO5R7UqG5U PP73G1xkHAkiMahVVwV8kKiqXP65FGJ/uiptRywBUMC1qc7BTN4V0pgXGNgDtx5kwr8n TLyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id kz15-20020a170902f9cf00b001c730c865f8si4008286plb.320.2023.10.06.13.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 13:10:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id F3213837B2E3; Fri, 6 Oct 2023 13:10:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233443AbjJFUKD (ORCPT + 18 others); Fri, 6 Oct 2023 16:10:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233427AbjJFUJv (ORCPT ); Fri, 6 Oct 2023 16:09:51 -0400 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4499D6 for ; Fri, 6 Oct 2023 13:09:48 -0700 (PDT) Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6c7b3adbeb6so1707582a34.0 for ; Fri, 06 Oct 2023 13:09:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622987; x=1697227787; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A+OCongk6Hb4BlpU4QfeNnEcgzo8GaBxo0N0PgFWYnw=; b=oYPGhqSWudq4DSh55FD4pGl9PfMRvlyV7uewGpdEmK5J2jT8iMQM3HbSe5+od+8/p/ ILu4kNB2H0P6yX0RH5+sbsoZ0QTy+I3SJBfbGFrZCE5wH6UYE1zaAJ3Frxa7UOpzTnPN mOCtLkGYXH6ztsPD/7YX+++3eri1TEA0lqAjMvuQ5vkn9Pegwts9AajpQss8EB77U1vG Yg0KNu/R/OM715LoHnaMfktzqlbk33A9t1sw6LrwLVdtXKtQ6Z4SFPCxi4KVMtDrTCMJ zIWbbgeVCG0tRyKx1+Q+CgURsLi5qjQmLW5FOMOTOCitf+rLKo6I/MY+YDgzdRpbOwhW iuXA== X-Gm-Message-State: AOJu0Yyb9R9l2m0fxaFWIugtgIgccZKy2GN8tzSlH+Hd3BBR52NcXacw K2NR6DRLKIMHkpWHtpbjvA== X-Received: by 2002:a05:6830:1502:b0:6bf:1f5f:ed18 with SMTP id k2-20020a056830150200b006bf1f5fed18mr8505526otp.1.1696622987671; Fri, 06 Oct 2023 13:09:47 -0700 (PDT) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id v8-20020a9d7d08000000b006c4be829aa8sm679959otn.44.2023.10.06.13.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 13:09:47 -0700 (PDT) Received: (nullmailer pid 229129 invoked by uid 1000); Fri, 06 Oct 2023 20:09:30 -0000 From: Rob Herring Date: Fri, 06 Oct 2023 15:09:12 -0500 Subject: [PATCH v3 3/5] ASoC: da7218: Use i2c_get_match_data() MIME-Version: 1.0 Message-Id: <20231006-dt-asoc-header-cleanups-v3-3-13a4f0f7fee6@kernel.org> References: <20231006-dt-asoc-header-cleanups-v3-0-13a4f0f7fee6@kernel.org> In-Reply-To: <20231006-dt-asoc-header-cleanups-v3-0-13a4f0f7fee6@kernel.org> To: Mark Brown , Claudiu Beznea , Jaroslav Kysela , Takashi Iwai , Peter Rosin , Lars-Peter Clausen , nuno.sa@analog.com, James Schulman , David Rhodes , Richard Fitzgerald , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Oder Chiou , Fabio Estevam , Kiseok Jo , Kevin Cernekee , Shengjiu Wang , Xiubo Li , Nicolin Chen , Srinivas Kandagatla , Banajit Goswami , Nicolas Frattaroli , Sylwester Nawrocki , Ban Tao , Peter Ujfalusi , Jarkko Nikula , Cezary Rojewski , Pierre-Louis Bossart , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Olivier Moysan , Arnaud Pouliquen , Maxime Coquelin , Alexandre Torgue Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org X-Mailer: b4 0.13-dev X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 06 Oct 2023 13:10:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779038178765204165 X-GMAIL-MSGID: 1779038178765204165 Use preferred i2c_get_match_data() instead of of_match_device() and i2c_match_id() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Avoid using 0 for enum da7218_dev_id so that no match data can be distinguished. Signed-off-by: Rob Herring --- sound/soc/codecs/da7218.c | 29 ++--------------------------- sound/soc/codecs/da7218.h | 2 +- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 3f456b08b809..8aacd7350798 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include @@ -2285,16 +2285,6 @@ static const struct of_device_id da7218_of_match[] = { }; MODULE_DEVICE_TABLE(of, da7218_of_match); -static inline int da7218_of_get_id(struct device *dev) -{ - const struct of_device_id *id = of_match_device(da7218_of_match, dev); - - if (id) - return (uintptr_t)id->data; - else - return -EINVAL; -} - static enum da7218_micbias_voltage da7218_of_micbias_lvl(struct snd_soc_component *component, u32 val) { @@ -3253,18 +3243,6 @@ static const struct regmap_config da7218_regmap_config = { * I2C layer */ -static const struct i2c_device_id da7218_i2c_id[]; - -static inline int da7218_i2c_get_id(struct i2c_client *i2c) -{ - const struct i2c_device_id *id = i2c_match_id(da7218_i2c_id, i2c); - - if (id) - return (uintptr_t)id->driver_data; - else - return -EINVAL; -} - static int da7218_i2c_probe(struct i2c_client *i2c) { struct da7218_priv *da7218; @@ -3276,10 +3254,7 @@ static int da7218_i2c_probe(struct i2c_client *i2c) i2c_set_clientdata(i2c, da7218); - if (i2c->dev.of_node) - da7218->dev_id = da7218_of_get_id(&i2c->dev); - else - da7218->dev_id = da7218_i2c_get_id(i2c); + da7218->dev_id = (uintptr_t)i2c_get_match_data(i2c); if ((da7218->dev_id != DA7217_DEV_ID) && (da7218->dev_id != DA7218_DEV_ID)) { diff --git a/sound/soc/codecs/da7218.h b/sound/soc/codecs/da7218.h index 9ac2892092b5..7f6a4aea2c7a 100644 --- a/sound/soc/codecs/da7218.h +++ b/sound/soc/codecs/da7218.h @@ -1369,7 +1369,7 @@ enum da7218_sys_clk { }; enum da7218_dev_id { - DA7217_DEV_ID = 0, + DA7217_DEV_ID = 1, DA7218_DEV_ID, };