[PATCH] Input - wacom: remove phys field in struct wacom

[PATCH] Input - wacom: remove phys field in struct wacom

[Benjamin Tissoires]

This field is not used, remove it.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
 drivers/input/tablet/wacom.h     | 1 -
 drivers/input/tablet/wacom_sys.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index 9ebf0ed..70b1e71 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -114,7 +114,6 @@ struct wacom {
 	struct mutex lock;
 	struct work_struct work;
 	bool open;
-	char phys[32];
 	struct wacom_led {
 		u8 select[2]; /* status led selector (0..3) */
 		u8 llv;       /* status led brightness no button (1..127) */
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 2c613cd..94096fd 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1323,8 +1323,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
 	wacom->intf = intf;
 	mutex_init(&wacom->lock);
 	INIT_WORK(&wacom->work, wacom_wireless_work);
-	usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
-	strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
 
 	endpoint = &intf->cur_altsetting->endpoint[0].desc;
 
-- 
1.9.0

Re: [PATCH] Input - wacom: remove phys field in struct wacom

[Dmitry Torokhov]

On Fri, Jun 13, 2014 at 04:29:04PM -0400, Benjamin Tissoires wrote:
> This field is not used, remove it.

We must have lost the assignment, but it should be assigned to phys of
corresponding input device. 

> 
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> ---
>  drivers/input/tablet/wacom.h     | 1 -
>  drivers/input/tablet/wacom_sys.c | 2 --
>  2 files changed, 3 deletions(-)
> 
> diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
> index 9ebf0ed..70b1e71 100644
> --- a/drivers/input/tablet/wacom.h
> +++ b/drivers/input/tablet/wacom.h
> @@ -114,7 +114,6 @@ struct wacom {
>  	struct mutex lock;
>  	struct work_struct work;
>  	bool open;
> -	char phys[32];
>  	struct wacom_led {
>  		u8 select[2]; /* status led selector (0..3) */
>  		u8 llv;       /* status led brightness no button (1..127) */
> diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
> index 2c613cd..94096fd 100644
> --- a/drivers/input/tablet/wacom_sys.c
> +++ b/drivers/input/tablet/wacom_sys.c
> @@ -1323,8 +1323,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
>  	wacom->intf = intf;
>  	mutex_init(&wacom->lock);
>  	INIT_WORK(&wacom->work, wacom_wireless_work);
> -	usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
> -	strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
>  
>  	endpoint = &intf->cur_altsetting->endpoint[0].desc;
>  
> -- 
> 1.9.0
> 

-- 
Dmitry

Re: [PATCH] Input - wacom: remove phys field in struct wacom

[Benjamin Tissoires]

On Jun 13 2014 or thereabouts, Dmitry Torokhov wrote:
> On Fri, Jun 13, 2014 at 04:29:04PM -0400, Benjamin Tissoires wrote:
> > This field is not used, remove it.
> 
> We must have lost the assignment, but it should be assigned to phys of
> corresponding input device. 

hehe. Even in 2007, when the files moved under drivers/input/tablet,
there is no mention of assigning input_dev->phys :)

I can send a patch to fix the other way around if you prefer (add
input_dev->phys).

Cheers,
Benjamin

> 
> > 
> > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> > ---
> >  drivers/input/tablet/wacom.h     | 1 -
> >  drivers/input/tablet/wacom_sys.c | 2 --
> >  2 files changed, 3 deletions(-)
> > 
> > diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
> > index 9ebf0ed..70b1e71 100644
> > --- a/drivers/input/tablet/wacom.h
> > +++ b/drivers/input/tablet/wacom.h
> > @@ -114,7 +114,6 @@ struct wacom {
> >  	struct mutex lock;
> >  	struct work_struct work;
> >  	bool open;
> > -	char phys[32];
> >  	struct wacom_led {
> >  		u8 select[2]; /* status led selector (0..3) */
> >  		u8 llv;       /* status led brightness no button (1..127) */
> > diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
> > index 2c613cd..94096fd 100644
> > --- a/drivers/input/tablet/wacom_sys.c
> > +++ b/drivers/input/tablet/wacom_sys.c
> > @@ -1323,8 +1323,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
> >  	wacom->intf = intf;
> >  	mutex_init(&wacom->lock);
> >  	INIT_WORK(&wacom->work, wacom_wireless_work);
> > -	usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
> > -	strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
> >  
> >  	endpoint = &intf->cur_altsetting->endpoint[0].desc;
> >  
> > -- 
> > 1.9.0
> > 
> 
> -- 
> Dmitry

Re: [PATCH] Input - wacom: remove phys field in struct wacom

[Benjamin Tissoires]

On Jun 13 2014 or thereabouts, Benjamin Tissoires wrote:
> On Jun 13 2014 or thereabouts, Dmitry Torokhov wrote:
> > On Fri, Jun 13, 2014 at 04:29:04PM -0400, Benjamin Tissoires wrote:
> > > This field is not used, remove it.
> > 
> > We must have lost the assignment, but it should be assigned to phys of
> > corresponding input device. 
> 
> hehe. Even in 2007, when the files moved under drivers/input/tablet,
> there is no mention of assigning input_dev->phys :)
> 
> I can send a patch to fix the other way around if you prefer (add
> input_dev->phys).
> 

Actually, I found the culprit:
$ git describe c5b7c7c395a34f12cdf246d66c1feeff2933d584
v2.6.14-21-gc5b7c7c
---> Thu Sep 15 02:01:47 2005

I should have wait one more year to fix it :)

No one complain about it for nearly 10 years, so I am not sure it will
help assigning the ->phys field of input_dev.

It's your call, Dmitry.

Cheers,
Benjamin