linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: Guenter Roeck <linux@roeck-us.net>
Cc: "David S . Miller" <davem@davemloft.net>,
	linux-usb@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usbnet: ipheth: Simplify device detection
Date: Fri, 26 Apr 2019 13:27:03 +0200	[thread overview]
Message-ID: <20190426112703.lrceujboxox6no3y@verge.net.au> (raw)
In-Reply-To: <1556128704-10831-1-git-send-email-linux@roeck-us.net>

On Wed, Apr 24, 2019 at 10:58:24AM -0700, Guenter Roeck wrote:
> All Apple products use the same protocol for tethering over USB.
> To simplify the code and make it future proof, use
> USB_VENDOR_AND_INTERFACE_INFO() instead of
> USB_DEVICE_AND_INTERFACE_INFO() to automatically detect and support
> all existing and future Apple products using the same interface.

What if future Apple products behave differently?

> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Tested with various iPads and iPhones up to X. iPhone 6 and later
> up to and including X all use product ID 0x12a8, so this patch is
> not strictly required, but it does simplify the code.
> 
>  drivers/net/usb/ipheth.c | 58 +++---------------------------------------------
>  1 file changed, 3 insertions(+), 55 deletions(-)
> 
> diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
> index 3d8a70d3ea9b..a01a71a7e48d 100644
> --- a/drivers/net/usb/ipheth.c
> +++ b/drivers/net/usb/ipheth.c
> @@ -54,17 +54,6 @@
>  #include <linux/workqueue.h>
>  
>  #define USB_VENDOR_APPLE        0x05ac
> -#define USB_PRODUCT_IPHONE      0x1290
> -#define USB_PRODUCT_IPHONE_3G   0x1292
> -#define USB_PRODUCT_IPHONE_3GS  0x1294
> -#define USB_PRODUCT_IPHONE_4	0x1297
> -#define USB_PRODUCT_IPAD 0x129a
> -#define USB_PRODUCT_IPAD_2	0x12a2
> -#define USB_PRODUCT_IPAD_3	0x12a6
> -#define USB_PRODUCT_IPAD_MINI    0x12ab
> -#define USB_PRODUCT_IPHONE_4_VZW 0x129c
> -#define USB_PRODUCT_IPHONE_4S	0x12a0
> -#define USB_PRODUCT_IPHONE_5	0x12a8
>  
>  #define IPHETH_USBINTF_CLASS    255
>  #define IPHETH_USBINTF_SUBCLASS 253
> @@ -88,50 +77,9 @@
>  #define IPHETH_CARRIER_ON       0x04
>  
>  static const struct usb_device_id ipheth_table[] = {
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3G,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPAD,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPAD_2,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPAD_3,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPAD_MINI,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4S,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> -	{ USB_DEVICE_AND_INTERFACE_INFO(
> -		USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_5,
> -		IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
> -		IPHETH_USBINTF_PROTO) },
> +	{ USB_VENDOR_AND_INTERFACE_INFO(USB_VENDOR_APPLE, IPHETH_USBINTF_CLASS,
> +					IPHETH_USBINTF_SUBCLASS,
> +					IPHETH_USBINTF_PROTO) },
>  	{ }
>  };
>  MODULE_DEVICE_TABLE(usb, ipheth_table);
> -- 
> 2.7.4
> 

  reply	other threads:[~2019-04-26 11:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-24 17:58 [PATCH] usbnet: ipheth: Simplify device detection Guenter Roeck
2019-04-26 11:27 ` Simon Horman [this message]
2019-04-26 12:13   ` Guenter Roeck
2019-04-26 12:59     ` Simon Horman
2019-04-26 15:34 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190426112703.lrceujboxox6no3y@verge.net.au \
    --to=horms@verge.net.au \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).