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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE9E1C41513 for ; Sat, 22 Jul 2023 17:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229553AbjGVRX5 (ORCPT ); Sat, 22 Jul 2023 13:23:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjGVRX4 (ORCPT ); Sat, 22 Jul 2023 13:23:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80A60B3; Sat, 22 Jul 2023 10:23:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A467B60B6B; Sat, 22 Jul 2023 17:23:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A6E4C433C7; Sat, 22 Jul 2023 17:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690046634; bh=RubKQhfIweT4khrMbQjkMpqAUGgRBzpRapyG4GxLZB8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=U70g24oA4sZLrdDLYGYR/IBxWmCsJ9gnMzC1hJdr/HgkcCcx+42xGxJ29cVmkK5y9 AVdTkwy4erIw9XSHKGa5/sdOApzDvAPyKLAt0EIk4wO+lNzgm66BJRm6eZt+0YPzWM /SzTuJhFQFLcayAUUjtMm8C+iddTOEVmXybfKkJooW51jnotBEUivxxnvXj5rHBHKw EpZXvJ+kBhlMM99S90dOkyjL9KI3AGxZJdiOxVzErtLZWiUofv8iDZ/ijAmjNVrfCc 3nVtZWitfA3GpNNyJI/IbwyQ7MrNUfQjZctJVbgMlQOdfQVKv3KUyS89cBKCJ0Vjvf 9g7XXWf0AZiHA== Date: Sat, 22 Jul 2023 18:23:50 +0100 From: Jonathan Cameron To: Biju Das Cc: Peter Rosin , Lars-Peter Clausen , linux-iio@vger.kernel.org, Geert Uytterhoeven , linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH v2] iio: potentiometer: mcp4531: Use i2c_get_match_data() Message-ID: <20230722182350.5e671c45@jic23-huawei> In-Reply-To: <20230721080153.179274-1-biju.das.jz@bp.renesas.com> References: <20230721080153.179274-1-biju.das.jz@bp.renesas.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Fri, 21 Jul 2023 09:01:53 +0100 Biju Das wrote: > Replace device_get_match_data() and i2c_match_id() by i2c_get_match > _data() by making similar I2C and DT-based matching table. > > Signed-off-by: Biju Das > --- > v1->v2: > * Added similar similar I2C and DT-based matching table. > * Dropped error check as all tables have data pointers. > > Note: > This patch is only compile tested. LGTM. Applied to the togreg branch of iio.git and pushed out as testing to see if 0-day can find anything we missed. Thanks, Jonathan > --- > drivers/iio/potentiometer/mcp4531.c | 138 ++++++++++++++-------------- > 1 file changed, 70 insertions(+), 68 deletions(-) > > diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c > index c513c00c8243..6b251b7acb60 100644 > --- a/drivers/iio/potentiometer/mcp4531.c > +++ b/drivers/iio/potentiometer/mcp4531.c > @@ -206,72 +206,76 @@ static const struct iio_info mcp4531_info = { > .write_raw = mcp4531_write_raw, > }; > > +#define MCP4531_ID_TABLE(name, cfg) { \ > + name, .driver_data = (kernel_ulong_t)&mcp4531_cfg[cfg], \ > +} > + > static const struct i2c_device_id mcp4531_id[] = { > - { "mcp4531-502", MCP453x_502 }, > - { "mcp4531-103", MCP453x_103 }, > - { "mcp4531-503", MCP453x_503 }, > - { "mcp4531-104", MCP453x_104 }, > - { "mcp4532-502", MCP453x_502 }, > - { "mcp4532-103", MCP453x_103 }, > - { "mcp4532-503", MCP453x_503 }, > - { "mcp4532-104", MCP453x_104 }, > - { "mcp4541-502", MCP454x_502 }, > - { "mcp4541-103", MCP454x_103 }, > - { "mcp4541-503", MCP454x_503 }, > - { "mcp4541-104", MCP454x_104 }, > - { "mcp4542-502", MCP454x_502 }, > - { "mcp4542-103", MCP454x_103 }, > - { "mcp4542-503", MCP454x_503 }, > - { "mcp4542-104", MCP454x_104 }, > - { "mcp4551-502", MCP455x_502 }, > - { "mcp4551-103", MCP455x_103 }, > - { "mcp4551-503", MCP455x_503 }, > - { "mcp4551-104", MCP455x_104 }, > - { "mcp4552-502", MCP455x_502 }, > - { "mcp4552-103", MCP455x_103 }, > - { "mcp4552-503", MCP455x_503 }, > - { "mcp4552-104", MCP455x_104 }, > - { "mcp4561-502", MCP456x_502 }, > - { "mcp4561-103", MCP456x_103 }, > - { "mcp4561-503", MCP456x_503 }, > - { "mcp4561-104", MCP456x_104 }, > - { "mcp4562-502", MCP456x_502 }, > - { "mcp4562-103", MCP456x_103 }, > - { "mcp4562-503", MCP456x_503 }, > - { "mcp4562-104", MCP456x_104 }, > - { "mcp4631-502", MCP463x_502 }, > - { "mcp4631-103", MCP463x_103 }, > - { "mcp4631-503", MCP463x_503 }, > - { "mcp4631-104", MCP463x_104 }, > - { "mcp4632-502", MCP463x_502 }, > - { "mcp4632-103", MCP463x_103 }, > - { "mcp4632-503", MCP463x_503 }, > - { "mcp4632-104", MCP463x_104 }, > - { "mcp4641-502", MCP464x_502 }, > - { "mcp4641-103", MCP464x_103 }, > - { "mcp4641-503", MCP464x_503 }, > - { "mcp4641-104", MCP464x_104 }, > - { "mcp4642-502", MCP464x_502 }, > - { "mcp4642-103", MCP464x_103 }, > - { "mcp4642-503", MCP464x_503 }, > - { "mcp4642-104", MCP464x_104 }, > - { "mcp4651-502", MCP465x_502 }, > - { "mcp4651-103", MCP465x_103 }, > - { "mcp4651-503", MCP465x_503 }, > - { "mcp4651-104", MCP465x_104 }, > - { "mcp4652-502", MCP465x_502 }, > - { "mcp4652-103", MCP465x_103 }, > - { "mcp4652-503", MCP465x_503 }, > - { "mcp4652-104", MCP465x_104 }, > - { "mcp4661-502", MCP466x_502 }, > - { "mcp4661-103", MCP466x_103 }, > - { "mcp4661-503", MCP466x_503 }, > - { "mcp4661-104", MCP466x_104 }, > - { "mcp4662-502", MCP466x_502 }, > - { "mcp4662-103", MCP466x_103 }, > - { "mcp4662-503", MCP466x_503 }, > - { "mcp4662-104", MCP466x_104 }, > - {} > + MCP4531_ID_TABLE("mcp4531-502", MCP453x_502), > + MCP4531_ID_TABLE("mcp4531-103", MCP453x_103), > + MCP4531_ID_TABLE("mcp4531-503", MCP453x_503), > + MCP4531_ID_TABLE("mcp4531-104", MCP453x_104), > + MCP4531_ID_TABLE("mcp4532-502", MCP453x_502), > + MCP4531_ID_TABLE("mcp4532-103", MCP453x_103), > + MCP4531_ID_TABLE("mcp4532-503", MCP453x_503), > + MCP4531_ID_TABLE("mcp4532-104", MCP453x_104), > + MCP4531_ID_TABLE("mcp4541-502", MCP454x_502), > + MCP4531_ID_TABLE("mcp4541-103", MCP454x_103), > + MCP4531_ID_TABLE("mcp4541-503", MCP454x_503), > + MCP4531_ID_TABLE("mcp4541-104", MCP454x_104), > + MCP4531_ID_TABLE("mcp4542-502", MCP454x_502), > + MCP4531_ID_TABLE("mcp4542-103", MCP454x_103), > + MCP4531_ID_TABLE("mcp4542-503", MCP454x_503), > + MCP4531_ID_TABLE("mcp4542-104", MCP454x_104), > + MCP4531_ID_TABLE("mcp4551-502", MCP455x_502), > + MCP4531_ID_TABLE("mcp4551-103", MCP455x_103), > + MCP4531_ID_TABLE("mcp4551-503", MCP455x_503), > + MCP4531_ID_TABLE("mcp4551-104", MCP455x_104), > + MCP4531_ID_TABLE("mcp4552-502", MCP455x_502), > + MCP4531_ID_TABLE("mcp4552-103", MCP455x_103), > + MCP4531_ID_TABLE("mcp4552-503", MCP455x_503), > + MCP4531_ID_TABLE("mcp4552-104", MCP455x_104), > + MCP4531_ID_TABLE("mcp4561-502", MCP456x_502), > + MCP4531_ID_TABLE("mcp4561-103", MCP456x_103), > + MCP4531_ID_TABLE("mcp4561-503", MCP456x_503), > + MCP4531_ID_TABLE("mcp4561-104", MCP456x_104), > + MCP4531_ID_TABLE("mcp4562-502", MCP456x_502), > + MCP4531_ID_TABLE("mcp4562-103", MCP456x_103), > + MCP4531_ID_TABLE("mcp4562-503", MCP456x_503), > + MCP4531_ID_TABLE("mcp4562-104", MCP456x_104), > + MCP4531_ID_TABLE("mcp4631-502", MCP463x_502), > + MCP4531_ID_TABLE("mcp4631-103", MCP463x_103), > + MCP4531_ID_TABLE("mcp4631-503", MCP463x_503), > + MCP4531_ID_TABLE("mcp4631-104", MCP463x_104), > + MCP4531_ID_TABLE("mcp4632-502", MCP463x_502), > + MCP4531_ID_TABLE("mcp4632-103", MCP463x_103), > + MCP4531_ID_TABLE("mcp4632-503", MCP463x_503), > + MCP4531_ID_TABLE("mcp4632-104", MCP463x_104), > + MCP4531_ID_TABLE("mcp4641-502", MCP464x_502), > + MCP4531_ID_TABLE("mcp4641-103", MCP464x_103), > + MCP4531_ID_TABLE("mcp4641-503", MCP464x_503), > + MCP4531_ID_TABLE("mcp4641-104", MCP464x_104), > + MCP4531_ID_TABLE("mcp4642-502", MCP464x_502), > + MCP4531_ID_TABLE("mcp4642-103", MCP464x_103), > + MCP4531_ID_TABLE("mcp4642-503", MCP464x_503), > + MCP4531_ID_TABLE("mcp4642-104", MCP464x_104), > + MCP4531_ID_TABLE("mcp4651-502", MCP465x_502), > + MCP4531_ID_TABLE("mcp4651-103", MCP465x_103), > + MCP4531_ID_TABLE("mcp4651-503", MCP465x_503), > + MCP4531_ID_TABLE("mcp4651-104", MCP465x_104), > + MCP4531_ID_TABLE("mcp4652-502", MCP465x_502), > + MCP4531_ID_TABLE("mcp4652-103", MCP465x_103), > + MCP4531_ID_TABLE("mcp4652-503", MCP465x_503), > + MCP4531_ID_TABLE("mcp4652-104", MCP465x_104), > + MCP4531_ID_TABLE("mcp4661-502", MCP466x_502), > + MCP4531_ID_TABLE("mcp4661-103", MCP466x_103), > + MCP4531_ID_TABLE("mcp4661-503", MCP466x_503), > + MCP4531_ID_TABLE("mcp4661-104", MCP466x_104), > + MCP4531_ID_TABLE("mcp4662-502", MCP466x_502), > + MCP4531_ID_TABLE("mcp4662-103", MCP466x_103), > + MCP4531_ID_TABLE("mcp4662-503", MCP466x_503), > + MCP4531_ID_TABLE("mcp4662-104", MCP466x_104), > + { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(i2c, mcp4531_id); > > @@ -368,9 +372,7 @@ static int mcp4531_probe(struct i2c_client *client) > i2c_set_clientdata(client, indio_dev); > data->client = client; > > - data->cfg = device_get_match_data(dev); > - if (!data->cfg) > - data->cfg = &mcp4531_cfg[i2c_match_id(mcp4531_id, client)->driver_data]; > + data->cfg = i2c_get_match_data(client); > > indio_dev->info = &mcp4531_info; > indio_dev->channels = mcp4531_channels;