Re: [PATCH 11/12] usb: serial: usb_debug: add support for dbc debug device

From: Greg Kroah-Hartman
Date: Wed Oct 28 2015 - 08:33:29 EST


On Wed, Oct 28, 2015 at 04:00:42PM +0800, Lu Baolu wrote:
> This patch add dbc debug device support in usb_debug driver.
>
> Signed-off-by: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/serial/usb_debug.c | 29 ++++++++++++++++++++++++++---
> 1 file changed, 26 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
> index ca2fa5b..d4903b0 100644
> --- a/drivers/usb/serial/usb_debug.c
> +++ b/drivers/usb/serial/usb_debug.c
> @@ -32,7 +32,18 @@ static const struct usb_device_id id_table[] = {
> { USB_DEVICE(0x0525, 0x127a) },
> { },
> };
> -MODULE_DEVICE_TABLE(usb, id_table);
> +
> +static const struct usb_device_id dbc_id_table[] = {
> + { USB_DEVICE(0x1d6b, 0x0004) },
> + { },
> +};
> +
> +static const struct usb_device_id id_table_combined[] = {
> + { USB_DEVICE(0x0525, 0x127a) },
> + { USB_DEVICE(0x1d6b, 0x0004) },
> + { },
> +};
> +MODULE_DEVICE_TABLE(usb, id_table_combined);

You shouldn't need a "combined" module device table anymore, the module
core was changed a while ago to remove that restriction, you should be
able to just multiple exports of MODULE_DEVICE_TABLE and everything
should "just work" on the export side. Now it might not work on the usb
core side, but that's a different issue...

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/