* [PATCH v2 3/6] USB: Implement usb_device_match_id()
@ 2019-10-15 14:27 Bastien Nocera
0 siblings, 0 replies; 3+ messages in thread
From: Bastien Nocera @ 2019-10-15 14:27 UTC (permalink / raw)
To: Alan Stern, linux-usb, Greg Kroah-Hartman, Benjamin Tissoires
Match a usb_device with a table of IDs.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/usb/core/driver.c | 15 +++++++++++++++
include/linux/usb.h | 2 ++
2 files changed, 17 insertions(+)
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index d3787d084937..cc3ca62111b4 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -800,6 +800,21 @@ const struct usb_device_id *usb_match_id(struct
usb_interface *interface,
}
EXPORT_SYMBOL_GPL(usb_match_id);
+const struct usb_device_id *usb_device_match_id(struct usb_device
*udev,
+ const struct usb_device_id *id)
+{
+ if (!id)
+ return NULL;
+
+ for (; id->idVendor || id->idProduct ; id++) {
+ if (usb_match_device(udev, id))
+ return id;
+ }
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(usb_device_match_id);
+
static int usb_device_match(struct device *dev, struct device_driver
*drv)
{
/* devices and interfaces are handled separately */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 94bd3b48a485..7bf9b9b9e81b 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -864,6 +864,8 @@ const struct usb_device_id *usb_match_id(struct
usb_interface *interface,
const struct usb_device_id
*id);
extern int usb_match_one_id(struct usb_interface *interface,
const struct usb_device_id *id);
+const struct usb_device_id *usb_device_match_id(struct usb_device
*udev,
+ const struct usb_device_id *id);
extern int usb_for_each_dev(void *data, int (*fn)(struct usb_device *,
void *));
extern struct usb_interface *usb_find_interface(struct usb_driver
*drv,
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 3/6] USB: Implement usb_device_match_id()
2019-10-15 14:31 ` [PATCH v2 3/6] USB: Implement usb_device_match_id() Bastien Nocera
@ 2019-10-15 19:05 ` Alan Stern
0 siblings, 0 replies; 3+ messages in thread
From: Alan Stern @ 2019-10-15 19:05 UTC (permalink / raw)
To: Bastien Nocera; +Cc: linux-usb, Greg Kroah-Hartman, Benjamin Tissoires
On Tue, 15 Oct 2019, Bastien Nocera wrote:
> Match a usb_device with a table of IDs.
>
> Signed-off-by: Bastien Nocera <hadess@hadess.net>
> ---
> drivers/usb/core/driver.c | 15 +++++++++++++++
> include/linux/usb.h | 2 ++
> 2 files changed, 17 insertions(+)
>
> diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
> index d3787d084937..cc3ca62111b4 100644
> --- a/drivers/usb/core/driver.c
> +++ b/drivers/usb/core/driver.c
> @@ -800,6 +800,21 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
> }
> EXPORT_SYMBOL_GPL(usb_match_id);
>
> +const struct usb_device_id *usb_device_match_id(struct usb_device *udev,
> + const struct usb_device_id *id)
> +{
> + if (!id)
> + return NULL;
> +
> + for (; id->idVendor || id->idProduct ; id++) {
> + if (usb_match_device(udev, id))
> + return id;
> + }
> +
> + return NULL;
> +}
> +EXPORT_SYMBOL_GPL(usb_device_match_id);
This function doesn't need to be EXPORT'ed.
Aside from that, the whole series looks okay to me. Feel free to
submit an updated version to Greg KH with my:
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Alan Stern
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 3/6] USB: Implement usb_device_match_id()
2019-10-15 14:31 [PATCH v2 0/6] Add Apple MFi fastcharge USB device driver Bastien Nocera
@ 2019-10-15 14:31 ` Bastien Nocera
2019-10-15 19:05 ` Alan Stern
0 siblings, 1 reply; 3+ messages in thread
From: Bastien Nocera @ 2019-10-15 14:31 UTC (permalink / raw)
To: linux-usb; +Cc: Greg Kroah-Hartman, Benjamin Tissoires, Bastien Nocera
Match a usb_device with a table of IDs.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/usb/core/driver.c | 15 +++++++++++++++
include/linux/usb.h | 2 ++
2 files changed, 17 insertions(+)
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index d3787d084937..cc3ca62111b4 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -800,6 +800,21 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
}
EXPORT_SYMBOL_GPL(usb_match_id);
+const struct usb_device_id *usb_device_match_id(struct usb_device *udev,
+ const struct usb_device_id *id)
+{
+ if (!id)
+ return NULL;
+
+ for (; id->idVendor || id->idProduct ; id++) {
+ if (usb_match_device(udev, id))
+ return id;
+ }
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(usb_device_match_id);
+
static int usb_device_match(struct device *dev, struct device_driver *drv)
{
/* devices and interfaces are handled separately */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 94bd3b48a485..7bf9b9b9e81b 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -864,6 +864,8 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
const struct usb_device_id *id);
extern int usb_match_one_id(struct usb_interface *interface,
const struct usb_device_id *id);
+const struct usb_device_id *usb_device_match_id(struct usb_device *udev,
+ const struct usb_device_id *id);
extern int usb_for_each_dev(void *data, int (*fn)(struct usb_device *, void *));
extern struct usb_interface *usb_find_interface(struct usb_driver *drv,
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-15 19:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-15 14:27 [PATCH v2 3/6] USB: Implement usb_device_match_id() Bastien Nocera
2019-10-15 14:31 [PATCH v2 0/6] Add Apple MFi fastcharge USB device driver Bastien Nocera
2019-10-15 14:31 ` [PATCH v2 3/6] USB: Implement usb_device_match_id() Bastien Nocera
2019-10-15 19:05 ` Alan Stern
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.