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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_2 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 74F8AC76188 for ; Fri, 19 Jul 2019 13:45:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E4CD2173B for ; Fri, 19 Jul 2019 13:45:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729216AbfGSNpJ (ORCPT ); Fri, 19 Jul 2019 09:45:09 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:39288 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726243AbfGSNpI (ORCPT ); Fri, 19 Jul 2019 09:45:08 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: bbrezillon) with ESMTPSA id 405D628C6EC Date: Fri, 19 Jul 2019 15:45:03 +0200 From: Boris Brezillon To: Vitor Soares Cc: linux-iio@vger.kernel.org, linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org, lorenzo@kernel.org, gregkh@linuxfoundation.org, rafael@kernel.org, bbrezillon@kernel.org, Joao.Pinto@synopsys.com Subject: Re: [PATCH v6 1/2] i3c: move i3c_device_match_id to device.c and export it Message-ID: <20190719154503.3f76d3a7@pc-375.home> In-Reply-To: <2f94d66bab7e1d47f7eae8cde8028fd37fa4c423.1563542515.git.vitor.soares@synopsys.com> References: <2f94d66bab7e1d47f7eae8cde8028fd37fa4c423.1563542515.git.vitor.soares@synopsys.com> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 19 Jul 2019 15:30:54 +0200 Vitor Soares wrote: > Some I3C device drivers need to know which entry matches the > i3c_device object passed to the probe function > > Let's move i3c_device_match_id() to device.c and export it so it can be > used by drivers. > > Signed-off-by: Vitor Soares Looks good to me. I'll apply the patch when -rc1 is out and provide an immutable branch for iio maintainers. > --- > Changes in v6: > Improve kerneldoc > > Changes in v5: > Add kerneldoc > Improve commit message > > Changes in v4: > None > > Changes in v3: > Remove i3c_get_device_id > Move i3c_device_match_id from drivers/i3c/master.c to drivers/i3c/device.c > Export i3c_device_match_id > > Changes in v2: > move this function to drivers/i3c/device.c > > drivers/i3c/device.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ > drivers/i3c/master.c | 45 --------------------------------------- > include/linux/i3c/device.h | 4 ++++ > 3 files changed, 57 insertions(+), 45 deletions(-) > > diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c > index 69cc040..c15f5ca 100644 > --- a/drivers/i3c/device.c > +++ b/drivers/i3c/device.c > @@ -201,6 +201,59 @@ struct i3c_device *dev_to_i3cdev(struct device *dev) > EXPORT_SYMBOL_GPL(dev_to_i3cdev); > > /** > + * i3c_device_match_id() - Returns the i3c_device_id entry matching @i3cdev > + * @i3cdev: I3C device > + * @id_table: I3C device match table > + * > + * Return: a pointer to an i3c_device_id object or NULL if there's no match. > + */ > +const struct i3c_device_id * > +i3c_device_match_id(struct i3c_device *i3cdev, > + const struct i3c_device_id *id_table) > +{ > + struct i3c_device_info devinfo; > + const struct i3c_device_id *id; > + > + i3c_device_get_info(i3cdev, &devinfo); > + > + /* > + * The lower 32bits of the provisional ID is just filled with a random > + * value, try to match using DCR info. > + */ > + if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) { > + u16 manuf = I3C_PID_MANUF_ID(devinfo.pid); > + u16 part = I3C_PID_PART_ID(devinfo.pid); > + u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid); > + > + /* First try to match by manufacturer/part ID. */ > + for (id = id_table; id->match_flags != 0; id++) { > + if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) != > + I3C_MATCH_MANUF_AND_PART) > + continue; > + > + if (manuf != id->manuf_id || part != id->part_id) > + continue; > + > + if ((id->match_flags & I3C_MATCH_EXTRA_INFO) && > + ext_info != id->extra_info) > + continue; > + > + return id; > + } > + } > + > + /* Fallback to DCR match. */ > + for (id = id_table; id->match_flags != 0; id++) { > + if ((id->match_flags & I3C_MATCH_DCR) && > + id->dcr == devinfo.dcr) > + return id; > + } > + > + return NULL; > +} > +EXPORT_SYMBOL_GPL(i3c_device_match_id); > + > +/** > * i3c_driver_register_with_owner() - register an I3C device driver > * > * @drv: driver to register > diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c > index 5f4bd52..7667f84 100644 > --- a/drivers/i3c/master.c > +++ b/drivers/i3c/master.c > @@ -270,51 +270,6 @@ static const struct device_type i3c_device_type = { > .uevent = i3c_device_uevent, > }; > > -static const struct i3c_device_id * > -i3c_device_match_id(struct i3c_device *i3cdev, > - const struct i3c_device_id *id_table) > -{ > - struct i3c_device_info devinfo; > - const struct i3c_device_id *id; > - > - i3c_device_get_info(i3cdev, &devinfo); > - > - /* > - * The lower 32bits of the provisional ID is just filled with a random > - * value, try to match using DCR info. > - */ > - if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) { > - u16 manuf = I3C_PID_MANUF_ID(devinfo.pid); > - u16 part = I3C_PID_PART_ID(devinfo.pid); > - u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid); > - > - /* First try to match by manufacturer/part ID. */ > - for (id = id_table; id->match_flags != 0; id++) { > - if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) != > - I3C_MATCH_MANUF_AND_PART) > - continue; > - > - if (manuf != id->manuf_id || part != id->part_id) > - continue; > - > - if ((id->match_flags & I3C_MATCH_EXTRA_INFO) && > - ext_info != id->extra_info) > - continue; > - > - return id; > - } > - } > - > - /* Fallback to DCR match. */ > - for (id = id_table; id->match_flags != 0; id++) { > - if ((id->match_flags & I3C_MATCH_DCR) && > - id->dcr == devinfo.dcr) > - return id; > - } > - > - return NULL; > -} > - > static int i3c_device_match(struct device *dev, struct device_driver *drv) > { > struct i3c_device *i3cdev; > diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h > index 5ecb055..de102e4 100644 > --- a/include/linux/i3c/device.h > +++ b/include/linux/i3c/device.h > @@ -188,6 +188,10 @@ static inline struct i3c_driver *drv_to_i3cdrv(struct device_driver *drv) > struct device *i3cdev_to_dev(struct i3c_device *i3cdev); > struct i3c_device *dev_to_i3cdev(struct device *dev); > > +const struct i3c_device_id * > +i3c_device_match_id(struct i3c_device *i3cdev, > + const struct i3c_device_id *id_table); > + > static inline void i3cdev_set_drvdata(struct i3c_device *i3cdev, > void *data) > {