Input: usbtouchscreen - use driver core to instantiate device attributes
Subsystems (2)
Dmitry Torokhov
maintainerPATCH 1/8 Input: usbtouchscreen - use driver core to instantiate device attributes
Instead of manually creating driver-specific device attributes set struct usb_driver->dev_groups pointer to have the driver core do it.
--- drivers/input/touchscreen/usbtouchscreen.c | 31 +++++++++++++++------- 1 file changed, 21 insertions(+), 10 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +21 -10
@@ -240,6 +240,7 @@ static const struct usb_device_id usbtouch_devices[] = { {} }; +static struct usbtouch_device_info usbtouch_dev_info[];/***************************************************************************** * e2i Part
@@ -466,7 +467,19 @@ static struct attribute *mtouch_attrs[] = { NULL }; +static bool mtouch_group_visible (struct kobject *kobj) +{ +struct device *dev =kobj_to_dev (kobj); +struct usb_interface *intf =to_usb_interface (dev); +struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); + +return usbtouch->type == &usbtouch_dev_info[DEVTYPE_3M ]; +} + +DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE (mtouch); +static const struct attribute_group mtouch_attr_group = { + .is_visible =SYSFS_GROUP_VISIBLE (mtouch), .attrs = mtouch_attrs, };
@@ -506,21 +519,12 @@ static int mtouch_get_fw_revision(struct usbtouch_usb *usbtouch)static int mtouch_alloc (struct usbtouch_usb *usbtouch) {struct mtouch_priv *priv; -int ret; priv =kmalloc (sizeof (*priv),GFP_KERNEL );if (!priv)return -ENOMEM ; usbtouch->priv = priv; - ret =sysfs_create_group (&usbtouch->interface->dev.kobj, - &mtouch_attr_group); -if (ret) { -kfree (usbtouch->priv); - usbtouch->priv =NULL ; -return ret; - } -return 0 ; }
@@ -571,7 +575,6 @@ static void mtouch_exit(struct usbtouch_usb *usbtouch) {struct mtouch_priv *priv = usbtouch->priv; -sysfs_remove_group (&usbtouch->interface->dev.kobj, &mtouch_attr_group);kfree (priv); }#endif
@@ -1842,6 +1845,13 @@ static void usbtouch_disconnect(struct usb_interface *intf)kfree (usbtouch); } +static const struct attribute_group *usbtouch_groups[] = { +#ifdef CONFIG_TOUCHSCREEN_USB_3M + &mtouch_attr_group, +#endif +NULL +}; +MODULE_DEVICE_TABLE (usb, usbtouch_devices);static struct usb_driver usbtouch_driver = {
@@ -1852,6 +1862,7 @@ static struct usb_driver usbtouch_driver = { .resume = usbtouch_resume, .reset_resume = usbtouch_reset_resume, .id_table = usbtouch_devices, + .dev_groups = usbtouch_groups, .supports_autosuspend = 1, };
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Dmitry Torokhov
maintainerPATCH 2/8 Input: usbtouchscreen - remove custom USB_DEVICE_HID_CLASS macro
There already exists perfectly suitable USB_DEVICE_INTERFACE_CLASS macro, use it.
--- drivers/input/touchscreen/usbtouchscreen.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +4 -9
@@ -130,18 +130,13 @@ enum { DEVTYPE_ETOUCH, }; -#define USB_DEVICE_HID_CLASS (vend, prod) \ - .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \ - | USB_DEVICE_ID_MATCH_DEVICE, \ - .idVendor = (vend), \ - .idProduct = (prod), \ - .bInterfaceClass = USB_INTERFACE_CLASS_HID -static const struct usb_device_id usbtouch_devices[] = { #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX/* ignore the HID capable devices, handled by usbhid */ - {USB_DEVICE_HID_CLASS (0x0eef ,0x0001 ), .driver_info =DEVTYPE_IGNORE }, - {USB_DEVICE_HID_CLASS (0x0eef ,0x0002 ), .driver_info =DEVTYPE_IGNORE }, + {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0001 ,USB_INTERFACE_CLASS_HID ), + .driver_info =DEVTYPE_IGNORE }, + {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0002 ,USB_INTERFACE_CLASS_HID ), + .driver_info =DEVTYPE_IGNORE },/* normal device IDs */ {USB_DEVICE(0x3823, 0x0001), .driver_info = DEVTYPE_EGALAX},
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Re: [PATCH 2/8] Input: usbtouchscreen - remove custom USB_DEVICE_HID_CLASS macro
Quoted 4 lines · Dmitry Torokhov
There already exists perfectly suitable
USB_DEVICE_INTERFACE_CLASSmacro, use it.Signed-off-by Dmitry Torokhov <[email protected]>
Dmitry Torokhov
maintainerPATCH 3/8 Input: usbtouchscreen - move the driver ID table
In reply to Dmitry TorokhovMove the driver's ID table closer to where it is used in preparation to it using pointers to device info/parameters instead of device type enum.
--- drivers/input/touchscreen/usbtouchscreen.c | 209 ++++++++++----------- 1 file changed, 104 insertions(+), 105 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +104 -105
@@ -130,111 +130,6 @@ enum { DEVTYPE_ETOUCH, }; -static const struct usb_device_id usbtouch_devices[] = { -#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX -/* ignore the HID capable devices, handled by usbhid */ - {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0001 ,USB_INTERFACE_CLASS_HID ), - .driver_info =DEVTYPE_IGNORE }, - {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0002 ,USB_INTERFACE_CLASS_HID ), - .driver_info =DEVTYPE_IGNORE }, - -/* normal device IDs */ - {USB_DEVICE (0x3823 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x3823 ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x0123 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x0eef ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x0eef ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x1234 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x1234 ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT - {USB_DEVICE (0x134c ,0x0001 ), .driver_info =DEVTYPE_PANJIT }, - {USB_DEVICE (0x134c ,0x0002 ), .driver_info =DEVTYPE_PANJIT }, - {USB_DEVICE (0x134c ,0x0003 ), .driver_info =DEVTYPE_PANJIT }, - {USB_DEVICE (0x134c ,0x0004 ), .driver_info =DEVTYPE_PANJIT }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_3M - {USB_DEVICE (0x0596 ,0x0001 ), .driver_info =DEVTYPE_3M }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ITM - {USB_DEVICE (0x0403 ,0xf9e9 ), .driver_info =DEVTYPE_ITM }, - {USB_DEVICE (0x16e3 ,0xf9e9 ), .driver_info =DEVTYPE_ITM }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO - {USB_DEVICE (0x1234 ,0x5678 ), .driver_info =DEVTYPE_ETURBO }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE - {USB_DEVICE (0x0637 ,0x0001 ), .driver_info =DEVTYPE_GUNZE }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10 - {USB_DEVICE (0x0afa ,0x03e8 ), .driver_info =DEVTYPE_DMC_TSC10 }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH - {USB_DEVICE (0x255e ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, - {USB_DEVICE (0x595a ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, - {USB_DEVICE (0x6615 ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, - {USB_DEVICE (0x6615 ,0x0012 ), .driver_info =DEVTYPE_IRTOUCH_HIRES }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK - {USB_DEVICE (0x1391 ,0x1000 ), .driver_info =DEVTYPE_IDEALTEK }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH - {USB_DEVICE (0x0dfc ,0x0001 ), .driver_info =DEVTYPE_GENERAL_TOUCH }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_GOTOP - {USB_DEVICE (0x08f2 ,0x007f ), .driver_info =DEVTYPE_GOTOP }, - {USB_DEVICE (0x08f2 ,0x00ce ), .driver_info =DEVTYPE_GOTOP }, - {USB_DEVICE (0x08f2 ,0x00f4 ), .driver_info =DEVTYPE_GOTOP }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC - {USB_DEVICE (0x0f92 ,0x0001 ), .driver_info =DEVTYPE_JASTEC }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_E2I - {USB_DEVICE (0x1ac7 ,0x0001 ), .driver_info =DEVTYPE_E2I }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ZYTRONIC - {USB_DEVICE (0x14c8 ,0x0003 ), .driver_info =DEVTYPE_ZYTRONIC }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB -/* TC5UH */ - {USB_DEVICE (0x0664 ,0x0309 ), .driver_info =DEVTYPE_TC45USB }, -/* TC4UM */ - {USB_DEVICE (0x0664 ,0x0306 ), .driver_info =DEVTYPE_TC45USB }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO -/* data interface only */ - {USB_DEVICE_AND_INTERFACE_INFO (0x10f0 ,0x2002 ,0x0a ,0x00 ,0x00 ), - .driver_info =DEVTYPE_NEXIO }, - {USB_DEVICE_AND_INTERFACE_INFO (0x1870 ,0x0001 ,0x0a ,0x00 ,0x00 ), - .driver_info =DEVTYPE_NEXIO }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ELO - {USB_DEVICE (0x04e7 ,0x0020 ), .driver_info =DEVTYPE_ELO }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_EASYTOUCH - {USB_DEVICE (0x7374 ,0x0001 ), .driver_info =DEVTYPE_ETOUCH }, -#endif - - {} -}; -static struct usbtouch_device_info usbtouch_dev_info[];/*****************************************************************************
@@ -1847,6 +1742,110 @@ static const struct attribute_group *usbtouch_groups[] = {NULL }; +static const struct usb_device_id usbtouch_devices[] = { +#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX +/* ignore the HID capable devices, handled by usbhid */ + {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0001 ,USB_INTERFACE_CLASS_HID ), + .driver_info =DEVTYPE_IGNORE }, + {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0002 ,USB_INTERFACE_CLASS_HID ), + .driver_info =DEVTYPE_IGNORE }, + +/* normal device IDs */ + {USB_DEVICE (0x3823 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, + {USB_DEVICE (0x3823 ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, + {USB_DEVICE (0x0123 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, + {USB_DEVICE (0x0eef ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, + {USB_DEVICE (0x0eef ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, + {USB_DEVICE (0x1234 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, + {USB_DEVICE (0x1234 ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT + {USB_DEVICE (0x134c ,0x0001 ), .driver_info =DEVTYPE_PANJIT }, + {USB_DEVICE (0x134c ,0x0002 ), .driver_info =DEVTYPE_PANJIT }, + {USB_DEVICE (0x134c ,0x0003 ), .driver_info =DEVTYPE_PANJIT }, + {USB_DEVICE (0x134c ,0x0004 ), .driver_info =DEVTYPE_PANJIT }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_3M + {USB_DEVICE (0x0596 ,0x0001 ), .driver_info =DEVTYPE_3M }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_ITM + {USB_DEVICE (0x0403 ,0xf9e9 ), .driver_info =DEVTYPE_ITM }, + {USB_DEVICE (0x16e3 ,0xf9e9 ), .driver_info =DEVTYPE_ITM }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO + {USB_DEVICE (0x1234 ,0x5678 ), .driver_info =DEVTYPE_ETURBO }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE + {USB_DEVICE (0x0637 ,0x0001 ), .driver_info =DEVTYPE_GUNZE }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10 + {USB_DEVICE (0x0afa ,0x03e8 ), .driver_info =DEVTYPE_DMC_TSC10 }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH + {USB_DEVICE (0x255e ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, + {USB_DEVICE (0x595a ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, + {USB_DEVICE (0x6615 ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, + {USB_DEVICE (0x6615 ,0x0012 ), .driver_info =DEVTYPE_IRTOUCH_HIRES }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK + {USB_DEVICE (0x1391 ,0x1000 ), .driver_info =DEVTYPE_IDEALTEK }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH + {USB_DEVICE (0x0dfc ,0x0001 ), .driver_info =DEVTYPE_GENERAL_TOUCH }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_GOTOP + {USB_DEVICE (0x08f2 ,0x007f ), .driver_info =DEVTYPE_GOTOP }, + {USB_DEVICE (0x08f2 ,0x00ce ), .driver_info =DEVTYPE_GOTOP }, + {USB_DEVICE (0x08f2 ,0x00f4 ), .driver_info =DEVTYPE_GOTOP }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC + {USB_DEVICE (0x0f92 ,0x0001 ), .driver_info =DEVTYPE_JASTEC }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_E2I + {USB_DEVICE (0x1ac7 ,0x0001 ), .driver_info =DEVTYPE_E2I }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_ZYTRONIC + {USB_DEVICE (0x14c8 ,0x0003 ), .driver_info =DEVTYPE_ZYTRONIC }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB +/* TC5UH */ + {USB_DEVICE (0x0664 ,0x0309 ), .driver_info =DEVTYPE_TC45USB }, +/* TC4UM */ + {USB_DEVICE (0x0664 ,0x0306 ), .driver_info =DEVTYPE_TC45USB }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO +/* data interface only */ + {USB_DEVICE_AND_INTERFACE_INFO (0x10f0 ,0x2002 ,0x0a ,0x00 ,0x00 ), + .driver_info =DEVTYPE_NEXIO }, + {USB_DEVICE_AND_INTERFACE_INFO (0x1870 ,0x0001 ,0x0a ,0x00 ,0x00 ), + .driver_info =DEVTYPE_NEXIO }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_ELO + {USB_DEVICE (0x04e7 ,0x0020 ), .driver_info =DEVTYPE_ELO }, +#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_EASYTOUCH + {USB_DEVICE (0x7374 ,0x0001 ), .driver_info =DEVTYPE_ETOUCH }, +#endif + + {} +};MODULE_DEVICE_TABLE (usb, usbtouch_devices);static struct usb_driver usbtouch_driver = {
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Re: [PATCH 3/8] Input: usbtouchscreen - move the driver ID table
Quoted 5 lines · Dmitry Torokhov
Move the driver's ID table closer to where it is used in preparation to it using pointers to device info/parameters instead of device type enum.
Signed-off-by Dmitry Torokhov <[email protected]>
Dmitry Torokhov
maintainerPATCH 4/8 Input: usbtouchscreen - move process_pkt() into main device structure
In reply to Dmitry TorokhovIn preparation of splitting big usbtouch_dev_info table into separate per-protocol structures and constifying them move process_pkt() from the device info into main drvice structure and set it up in probe(). We can derive if we should use single- or multi-packet handling based on presence of get_pkt_len() method.
--- drivers/input/touchscreen/usbtouchscreen.c | 28 ++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +13 -15
@@ -68,8 +68,6 @@ struct usbtouch_device_info {*/ bool irq_always; -void (*process_pkt) (struct usbtouch_usb *usbtouch,unsigned char *pkt,int len); -/* * used to get the packet len. possible return values: * > 0: packet len
@@ -103,6 +101,8 @@ struct usbtouch_usb {int x, y;int touch, press; + +void (*process_pkt)(struct usbtouch_usb *usbtouch,unsigned char *pkt,int len); };
@@ -1045,11 +1045,6 @@ static int elo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)/***************************************************************************** * the different device descriptors */ -#ifdef MULTI_PACKET -static void usbtouch_process_multi (struct usbtouch_usb *usbtouch, -unsigned char *pkt,int len); -#endif - static struct usbtouch_device_info usbtouch_dev_info[] = { #ifdef CONFIG_TOUCHSCREEN_USB_ELO [DEVTYPE_ELO] = {
@@ -1070,7 +1065,6 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { .min_yc = 0x0, .max_yc = 0x07ff, .rept_size = 16, - .process_pkt = usbtouch_process_multi, .get_pkt_len = egalax_get_pkt_len, .read_data = egalax_read_data, .init = egalax_init,
@@ -1121,7 +1115,6 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { .min_yc = 0x0, .max_yc = 0x07ff, .rept_size = 8, - .process_pkt = usbtouch_process_multi, .get_pkt_len = eturbo_get_pkt_len, .read_data = eturbo_read_data, },
@@ -1177,7 +1170,6 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { .min_yc = 0x0, .max_yc = 0x0fff, .rept_size = 8, - .process_pkt = usbtouch_process_multi, .get_pkt_len = idealtek_get_pkt_len, .read_data = idealtek_read_data, },
@@ -1268,7 +1260,6 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { .min_yc = 0x0, .max_yc = 0x07ff, .rept_size = 16, - .process_pkt = usbtouch_process_multi, .get_pkt_len = etouch_get_pkt_len, .read_data = etouch_read_data, },
@@ -1378,9 +1369,15 @@ static void usbtouch_process_multi(struct usbtouch_usb *usbtouch, usbtouch->buf_len =0 ; return; } +#else +static void usbtouch_process_multi (struct usbtouch_usb *usbtouch, +unsigned char *pkt,int len) +{ +dev_WARN_ONCE (&usbtouch->interface->dev,1 , +"Protocol has ->get_pkt_len() without #define MULTI_PACKET" ); +}#endif -static void usbtouch_irq (struct urb *urb) {struct usbtouch_usb *usbtouch = urb->context;
@@ -1411,7 +1408,7 @@ static void usbtouch_irq(struct urb *urb) goto exit; } - usbtouch->type->process_pkt (usbtouch, usbtouch->data, urb->actual_length); + usbtouch->process_pkt (usbtouch, usbtouch->data, urb->actual_length); exit:usb_mark_last_busy (interface_to_usbdev (usbtouch->interface));
@@ -1564,8 +1561,6 @@ static int usbtouch_probe(struct usb_interface *intf, type = &usbtouch_dev_info[id->driver_info]; usbtouch->type = type; -if (!type->process_pkt) - type->process_pkt = usbtouch_process_pkt; usbtouch->data_size = type->rept_size;if (type->get_pkt_len) {
@@ -1589,6 +1584,9 @@ static int usbtouch_probe(struct usb_interface *intf, usbtouch->buffer =kmalloc (type->rept_size,GFP_KERNEL );if (!usbtouch->buffer) goto out_free_buffers; + usbtouch->process_pkt = usbtouch_process_multi; + }else { + usbtouch->process_pkt = usbtouch_process_pkt; } usbtouch->irq =usb_alloc_urb (0 ,GFP_KERNEL );
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Re: [PATCH 4/8] Input: usbtouchscreen - move process_pkt() into main device structure
Quoted 7 lines · Dmitry Torokhov
In preparation of splitting big
usbtouch_dev_infotable into separate per-protocol structures and constifying them moveprocess_pkt()from the device info into main drvice structure and set it up inprobe(). We can derive if we should use single- or multi-packet handling based on presence ofget_pkt_len()method.Signed-off-by Dmitry Torokhov <[email protected]>
Dmitry Torokhov
maintainerPATCH 5/8 Input: usbtouchscreen - constify usbtouch_dev_info table
In reply to Dmitry TorokhovThe data in this table is shared between all instances of the touchscreens so it should not be modified.
--- drivers/input/touchscreen/usbtouchscreen.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +9 -11
@@ -92,7 +92,7 @@ struct usbtouch_usb {struct urb *irq;struct usb_interface *interface;struct input_dev *input; -struct usbtouch_device_info *type; +const struct usbtouch_device_info *type;struct mutex pm_mutex;/* serialize access to open/suspend */ bool is_open;char name[128 ];
@@ -130,7 +130,7 @@ enum { DEVTYPE_ETOUCH, }; -static struct usbtouch_device_info usbtouch_dev_info[]; +static const struct usbtouch_device_info usbtouch_dev_info[];/***************************************************************************** * e2i Part
@@ -960,13 +960,11 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt)if (ret)dev_warn (dev,"Failed to submit ACK URB: %d\n" , ret); -if (!usbtouch->type->max_xc) { - usbtouch->type->max_xc =2 * x_len; +if (!input_abs_get_max (usbtouch->input,ABS_X )) {input_set_abs_params (usbtouch->input,ABS_X , -0 , usbtouch->type->max_xc,0 ,0 ); - usbtouch->type->max_yc =2 * y_len; +0 ,2 * x_len,0 ,0 );input_set_abs_params (usbtouch->input,ABS_Y , -0 , usbtouch->type->max_yc,0 ,0 ); +0 ,2 * y_len,0 ,0 ); }/* * The device reports state of IR sensors on X and Y axes.
@@ -1045,7 +1043,7 @@ static int elo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)/***************************************************************************** * the different device descriptors */ -static struct usbtouch_device_info usbtouch_dev_info[] = { +static const struct usbtouch_device_info usbtouch_dev_info[] = { #ifdef CONFIG_TOUCHSCREEN_USB_ELO [DEVTYPE_ELO] = { .min_xc =0x0 ,
@@ -1273,10 +1271,10 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {static void usbtouch_process_pkt (struct usbtouch_usb *usbtouch,unsigned char *pkt,int len) { -struct usbtouch_device_info *type = usbtouch->type; +const struct usbtouch_device_info *type = usbtouch->type;if (!type->read_data (usbtouch, pkt)) -return ; +return ;input_report_key (usbtouch->input,BTN_TOUCH , usbtouch->touch);
@@ -1538,7 +1536,7 @@ static int usbtouch_probe(struct usb_interface *intf,struct input_dev *input_dev;struct usb_endpoint_descriptor *endpoint;struct usb_device *udev =interface_to_usbdev (intf); -struct usbtouch_device_info *type; +const struct usbtouch_device_info *type;int err = -ENOMEM ;/* some devices are ignored */
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Re: [PATCH 5/8] Input: usbtouchscreen - constify usbtouch_dev_info table
Quoted 4 lines · Dmitry Torokhov
The data in this table is shared between all instances of the touchscreens so it should not be modified.
Signed-off-by Dmitry Torokhov <[email protected]>
Dmitry Torokhov
maintainerPATCH 6/8 Input: usbtouchscreen - split device info table into individual pieces
In reply to Dmitry TorokhovInstead of using a single table containing information about various touchscreens and enums to match the driver ID table data with chip information define individual per-protocol instances of usbtouch_device_info structure and reference them directly from the usbtouch_devices ID table. This is simpler, safer, and uses less memory in case some protocols are disabled.
--- drivers/input/touchscreen/usbtouchscreen.c | 624 ++++++++++----------- 1 file changed, 293 insertions(+), 331 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +293 -331
@@ -106,32 +106,6 @@ struct usbtouch_usb { }; -/* device types */ -enum { -DEVTYPE_IGNORE =-1 , -DEVTYPE_EGALAX , -DEVTYPE_PANJIT , -DEVTYPE_3M , -DEVTYPE_ITM , -DEVTYPE_ETURBO , -DEVTYPE_GUNZE , -DEVTYPE_DMC_TSC10 , -DEVTYPE_IRTOUCH , -DEVTYPE_IRTOUCH_HIRES , -DEVTYPE_IDEALTEK , -DEVTYPE_GENERAL_TOUCH , -DEVTYPE_GOTOP , -DEVTYPE_JASTEC , -DEVTYPE_E2I , -DEVTYPE_ZYTRONIC , -DEVTYPE_TC45USB , -DEVTYPE_NEXIO , -DEVTYPE_ELO , -DEVTYPE_ETOUCH , -}; - -static const struct usbtouch_device_info usbtouch_dev_info[]; -/***************************************************************************** * e2i Part */
@@ -164,6 +138,16 @@ static int e2i_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info e2i_dev_info = { + .min_xc =0x0 , + .max_xc =0x7fff , + .min_yc =0x0 , + .max_yc =0x7fff , + .rept_size =6 , + .init = e2i_init, + .read_data = e2i_read_data, +};#endif
@@ -247,6 +231,17 @@ static int egalax_get_pkt_len(unsigned char *buf, int len) return 0; } + +static const struct usbtouch_device_info egalax_dev_info = { + .min_xc =0x0 , + .max_xc =0x07ff , + .min_yc =0x0 , + .max_yc =0x07ff , + .rept_size =16 , + .get_pkt_len = egalax_get_pkt_len, + .read_data = egalax_read_data, + .init = egalax_init, +};#endif /*****************************************************************************
@@ -293,6 +288,16 @@ static int etouch_get_pkt_len(unsigned char *buf, int len) return 0; } + +static const struct usbtouch_device_info etouch_dev_info = { + .min_xc =0x0 , + .max_xc =0x07ff , + .min_yc =0x0 , + .max_yc =0x07ff , + .rept_size =16 , + .get_pkt_len = etouch_get_pkt_len, + .read_data = etouch_read_data, +};#endif /*****************************************************************************
@@ -307,6 +312,15 @@ static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info panjit_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .rept_size =8 , + .read_data = panjit_read_data, +};#endif
@@ -340,39 +354,6 @@ struct mtouch_priv {u8 fw_rev_minor; }; -static ssize_t mtouch_firmware_rev_show (struct device *dev, -struct device_attribute *attr,char *output) -{ -struct usb_interface *intf =to_usb_interface (dev); -struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); -struct mtouch_priv *priv = usbtouch->priv; - -return sysfs_emit (output,"%1x.%1x\n" , - priv->fw_rev_major, priv->fw_rev_minor); -} -static DEVICE_ATTR(firmware_rev, 0444, mtouch_firmware_rev_show, NULL); - -static struct attribute *mtouch_attrs[] = { - &dev_attr_firmware_rev.attr, -NULL -}; - -static bool mtouch_group_visible (struct kobject *kobj) -{ -struct device *dev =kobj_to_dev (kobj); -struct usb_interface *intf =to_usb_interface (dev); -struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); - -return usbtouch->type == &usbtouch_dev_info[DEVTYPE_3M ]; -} - -DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE (mtouch); - -static const struct attribute_group mtouch_attr_group = { - .is_visible =SYSFS_GROUP_VISIBLE (mtouch), - .attrs = mtouch_attrs, -}; -static int mtouch_get_fw_revision (struct usbtouch_usb *usbtouch) {struct usb_device *udev =interface_to_usbdev (usbtouch->interface);
@@ -467,6 +448,51 @@ static void mtouch_exit(struct usbtouch_usb *usbtouch)kfree (priv); } + +static struct usbtouch_device_info mtouch_dev_info = { + .min_xc =0x0 , + .max_xc =0x4000 , + .min_yc =0x0 , + .max_yc =0x4000 , + .rept_size =11 , + .read_data = mtouch_read_data, + .alloc = mtouch_alloc, + .init = mtouch_init, + .exit = mtouch_exit, +}; + +static ssize_t mtouch_firmware_rev_show (struct device *dev, +struct device_attribute *attr,char *output) +{ +struct usb_interface *intf =to_usb_interface (dev); +struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); +struct mtouch_priv *priv = usbtouch->priv; + +return sysfs_emit (output,"%1x.%1x\n" , + priv->fw_rev_major, priv->fw_rev_minor); +} +static DEVICE_ATTR(firmware_rev, 0444, mtouch_firmware_rev_show, NULL); + +static struct attribute *mtouch_attrs[] = { + &dev_attr_firmware_rev.attr, +NULL +}; + +static bool mtouch_group_visible (struct kobject *kobj) +{ +struct device *dev =kobj_to_dev (kobj); +struct usb_interface *intf =to_usb_interface (dev); +struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); + +return usbtouch->type == &mtouch_dev_info; +} + +DEFINE_SIMPLE_SYSFS_GROUP_VISIBLE (mtouch); + +static const struct attribute_group mtouch_attr_group = { + .is_visible =SYSFS_GROUP_VISIBLE (mtouch), + .attrs = mtouch_attrs, +};#endif
@@ -501,6 +527,16 @@ static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info itm_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .max_press =0xff , + .rept_size =8 , + .read_data = itm_read_data, +};#endif
@@ -535,6 +571,16 @@ static int eturbo_get_pkt_len(unsigned char *buf, int len)return 3 ; return 0; } + +static const struct usbtouch_device_info eturbo_dev_info = { + .min_xc =0x0 , + .max_xc =0x07ff , + .min_yc =0x0 , + .max_yc =0x07ff , + .rept_size =8 , + .get_pkt_len = eturbo_get_pkt_len, + .read_data = eturbo_read_data, +};#endif
@@ -553,6 +599,15 @@ static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info gunze_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .rept_size =4 , + .read_data = gunze_read_data, +};#endif /*****************************************************************************
@@ -636,6 +691,16 @@ static int dmc_tsc10_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info dmc_tsc10_dev_info = { + .min_xc =0x0 , + .max_xc =0x03ff , + .min_yc =0x0 , + .max_yc =0x03ff , + .rept_size =5 , + .init = dmc_tsc10_init, + .read_data = dmc_tsc10_read_data, +};#endif
@@ -651,6 +716,24 @@ static int irtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info irtouch_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .rept_size =8 , + .read_data = irtouch_read_data, +}; + +static const struct usbtouch_device_info irtouch_hires_dev_info = { + .min_xc =0x0 , + .max_xc =0x7fff , + .min_yc =0x0 , + .max_yc =0x7fff , + .rept_size =8 , + .read_data = irtouch_read_data, +};#endif /*****************************************************************************
@@ -665,6 +748,15 @@ static int tc45usb_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info tc45usb_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .rept_size =5 , + .read_data = tc45usb_read_data, +};#endif /*****************************************************************************
@@ -704,6 +796,16 @@ static int idealtek_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 0; } } + +static const struct usbtouch_device_info idealtek_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .rept_size =8 , + .get_pkt_len = idealtek_get_pkt_len, + .read_data = idealtek_read_data, +};#endif /*****************************************************************************
@@ -719,6 +821,15 @@ static int general_touch_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info general_touch_dev_info = { + .min_xc =0x0 , + .max_xc =0x7fff , + .min_yc =0x0 , + .max_yc =0x7fff , + .rept_size =7 , + .read_data = general_touch_read_data, +};#endif /*****************************************************************************
@@ -733,6 +844,15 @@ static int gotop_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info gotop_dev_info = { + .min_xc =0x0 , + .max_xc =0x03ff , + .min_yc =0x0 , + .max_yc =0x03ff , + .rept_size =4 , + .read_data = gotop_read_data, +};#endif /*****************************************************************************
@@ -747,6 +867,15 @@ static int jastec_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } + +static const struct usbtouch_device_info jastec_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .rept_size =4 , + .read_data = jastec_read_data, +};#endif /*****************************************************************************
@@ -783,6 +912,16 @@ static int zytronic_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 0; } + +static const struct usbtouch_device_info zytronic_dev_info = { + .min_xc =0x0 , + .max_xc =0x03ff , + .min_yc =0x0 , + .max_yc =0x03ff , + .rept_size =5 , + .read_data = zytronic_read_data, + .irq_always = true, +};#endif /*****************************************************************************
@@ -1019,6 +1158,15 @@ static int nexio_read_data(struct usbtouch_usb *usbtouch, unsigned char *pkt) }return 0 ; } + +static const struct usbtouch_device_info nexio_dev_info = { + .rept_size =1024 , + .irq_always = true, + .read_data = nexio_read_data, + .alloc = nexio_alloc, + .init = nexio_init, + .exit = nexio_exit, +};#endif
@@ -1037,232 +1185,17 @@ static int elo_read_data(struct usbtouch_usb *dev, unsigned char *pkt) return 1; } -#endif - - -/***************************************************************************** -* the different device descriptors -*/ -static const struct usbtouch_device_info usbtouch_dev_info[] = { -#ifdef CONFIG_TOUCHSCREEN_USB_ELO - [DEVTYPE_ELO] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .max_press =0xff , - .rept_size =8 , - .read_data = elo_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX - [DEVTYPE_EGALAX] = { - .min_xc =0x0 , - .max_xc =0x07ff , - .min_yc =0x0 , - .max_yc =0x07ff , - .rept_size =16 , - .get_pkt_len = egalax_get_pkt_len, - .read_data = egalax_read_data, - .init = egalax_init, - }, -#endif -#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT - [DEVTYPE_PANJIT] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .rept_size =8 , - .read_data = panjit_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_3M - [DEVTYPE_3M] = { - .min_xc =0x0 , - .max_xc =0x4000 , - .min_yc =0x0 , - .max_yc =0x4000 , - .rept_size =11 , - .read_data = mtouch_read_data, - .alloc = mtouch_alloc, - .init = mtouch_init, - .exit = mtouch_exit, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ITM - [DEVTYPE_ITM] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .max_press =0xff , - .rept_size =8 , - .read_data = itm_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO - [DEVTYPE_ETURBO] = { - .min_xc =0x0 , - .max_xc =0x07ff , - .min_yc =0x0 , - .max_yc =0x07ff , - .rept_size =8 , - .get_pkt_len = eturbo_get_pkt_len, - .read_data = eturbo_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE - [DEVTYPE_GUNZE] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .rept_size =4 , - .read_data = gunze_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10 - [DEVTYPE_DMC_TSC10] = { - .min_xc =0x0 , - .max_xc =0x03ff , - .min_yc =0x0 , - .max_yc =0x03ff , - .rept_size =5 , - .init = dmc_tsc10_init, - .read_data = dmc_tsc10_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH - [DEVTYPE_IRTOUCH] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .rept_size =8 , - .read_data = irtouch_read_data, - }, - - [DEVTYPE_IRTOUCH_HIRES ] = { - .min_xc =0x0 , - .max_xc =0x7fff , - .min_yc =0x0 , - .max_yc =0x7fff , - .rept_size =8 , - .read_data = irtouch_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK - [DEVTYPE_IDEALTEK] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .rept_size =8 , - .get_pkt_len = idealtek_get_pkt_len, - .read_data = idealtek_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH - [DEVTYPE_GENERAL_TOUCH] = { - .min_xc =0x0 , - .max_xc =0x7fff , - .min_yc =0x0 , - .max_yc =0x7fff , - .rept_size =7 , - .read_data = general_touch_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_GOTOP - [DEVTYPE_GOTOP] = { - .min_xc =0x0 , - .max_xc =0x03ff , - .min_yc =0x0 , - .max_yc =0x03ff , - .rept_size =4 , - .read_data = gotop_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC - [DEVTYPE_JASTEC] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .rept_size =4 , - .read_data = jastec_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_E2I - [DEVTYPE_E2I] = { - .min_xc =0x0 , - .max_xc =0x7fff , - .min_yc =0x0 , - .max_yc =0x7fff , - .rept_size =6 , - .init = e2i_init, - .read_data = e2i_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ZYTRONIC - [DEVTYPE_ZYTRONIC] = { - .min_xc =0x0 , - .max_xc =0x03ff , - .min_yc =0x0 , - .max_yc =0x03ff , - .rept_size =5 , - .read_data = zytronic_read_data, - .irq_always = true, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB - [DEVTYPE_TC45USB] = { - .min_xc =0x0 , - .max_xc =0x0fff , - .min_yc =0x0 , - .max_yc =0x0fff , - .rept_size =5 , - .read_data = tc45usb_read_data, - }, -#endif - -#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO - [DEVTYPE_NEXIO] = { - .rept_size =1024 , - .irq_always = true, - .read_data = nexio_read_data, - .alloc = nexio_alloc, - .init = nexio_init, - .exit = nexio_exit, - }, -#endif -#ifdef CONFIG_TOUCHSCREEN_USB_EASYTOUCH - [DEVTYPE_ETOUCH] = { - .min_xc =0x0 , - .max_xc =0x07ff , - .min_yc =0x0 , - .max_yc =0x07ff , - .rept_size =16 , - .get_pkt_len = etouch_get_pkt_len, - .read_data = etouch_read_data, - }, -#endif +static const struct usbtouch_device_info elo_dev_info = { + .min_xc =0x0 , + .max_xc =0x0fff , + .min_yc =0x0 , + .max_yc =0x0fff , + .max_press =0xff , + .rept_size =8 , + .read_data = elo_read_data, }; +#endif /*****************************************************************************
@@ -1540,10 +1473,8 @@ static int usbtouch_probe(struct usb_interface *intf,int err = -ENOMEM ;/* some devices are ignored */ -if (id->driver_info ==DEVTYPE_IGNORE ) -return -ENODEV ; - -if (id->driver_info >=ARRAY_SIZE (usbtouch_dev_info)) + type = (const struct usbtouch_device_info *)id->driver_info; +if (!type)return -ENODEV ; endpoint =usbtouch_get_input_endpoint (intf->cur_altsetting);
@@ -1556,8 +1487,6 @@ static int usbtouch_probe(struct usb_interface *intf, goto out_free;mutex_init (&usbtouch->pm_mutex); - - type = &usbtouch_dev_info[id->driver_info]; usbtouch->type = type; usbtouch->data_size = type->rept_size;
@@ -1741,106 +1670,139 @@ static const struct attribute_group *usbtouch_groups[] = {static const struct usb_device_id usbtouch_devices[] = { #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX/* ignore the HID capable devices, handled by usbhid */ - {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0001 ,USB_INTERFACE_CLASS_HID ), - .driver_info =DEVTYPE_IGNORE }, - {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0002 ,USB_INTERFACE_CLASS_HID ), - .driver_info =DEVTYPE_IGNORE }, + {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0001 ,USB_INTERFACE_CLASS_HID ), + .driver_info =0 }, + {USB_DEVICE_INTERFACE_CLASS (0x0eef ,0x0002 ,USB_INTERFACE_CLASS_HID ), + .driver_info =0 },/* normal device IDs */ - {USB_DEVICE (0x3823 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x3823 ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x0123 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x0eef ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x0eef ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x1234 ,0x0001 ), .driver_info =DEVTYPE_EGALAX }, - {USB_DEVICE (0x1234 ,0x0002 ), .driver_info =DEVTYPE_EGALAX }, + {USB_DEVICE (0x3823 ,0x0001 ), + .driver_info = (kernel_ulong_t)&egalax_dev_info }, + {USB_DEVICE (0x3823 ,0x0002 ), + .driver_info = (kernel_ulong_t)&egalax_dev_info }, + {USB_DEVICE (0x0123 ,0x0001 ), + .driver_info = (kernel_ulong_t)&egalax_dev_info }, + {USB_DEVICE (0x0eef ,0x0001 ), + .driver_info = (kernel_ulong_t)&egalax_dev_info }, + {USB_DEVICE (0x0eef ,0x0002 ), + .driver_info = (kernel_ulong_t)&egalax_dev_info }, + {USB_DEVICE (0x1234 ,0x0001 ), + .driver_info = (kernel_ulong_t)&egalax_dev_info }, + {USB_DEVICE (0x1234 ,0x0002 ), + .driver_info = (kernel_ulong_t)&egalax_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_PANJIT - {USB_DEVICE (0x134c ,0x0001 ), .driver_info =DEVTYPE_PANJIT }, - {USB_DEVICE (0x134c ,0x0002 ), .driver_info =DEVTYPE_PANJIT }, - {USB_DEVICE (0x134c ,0x0003 ), .driver_info =DEVTYPE_PANJIT }, - {USB_DEVICE (0x134c ,0x0004 ), .driver_info =DEVTYPE_PANJIT }, + {USB_DEVICE (0x134c ,0x0001 ), + .driver_info = (kernel_ulong_t)&panjit_dev_info }, + {USB_DEVICE (0x134c ,0x0002 ), + .driver_info = (kernel_ulong_t)&panjit_dev_info }, + {USB_DEVICE (0x134c ,0x0003 ), + .driver_info = (kernel_ulong_t)&panjit_dev_info }, + {USB_DEVICE (0x134c ,0x0004 ), + .driver_info = (kernel_ulong_t)&panjit_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_3M - {USB_DEVICE (0x0596 ,0x0001 ), .driver_info =DEVTYPE_3M }, + {USB_DEVICE (0x0596 ,0x0001 ), + .driver_info = (kernel_ulong_t)&mtouch_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_ITM - {USB_DEVICE (0x0403 ,0xf9e9 ), .driver_info =DEVTYPE_ITM }, - {USB_DEVICE (0x16e3 ,0xf9e9 ), .driver_info =DEVTYPE_ITM }, + {USB_DEVICE (0x0403 ,0xf9e9 ), + .driver_info = (kernel_ulong_t)&itm_dev_info }, + {USB_DEVICE (0x16e3 ,0xf9e9 ), + .driver_info = (kernel_ulong_t)&itm_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_ETURBO - {USB_DEVICE (0x1234 ,0x5678 ), .driver_info =DEVTYPE_ETURBO }, + {USB_DEVICE (0x1234 ,0x5678 ), + .driver_info = (kernel_ulong_t)&eturbo_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_GUNZE - {USB_DEVICE (0x0637 ,0x0001 ), .driver_info =DEVTYPE_GUNZE }, + {USB_DEVICE (0x0637 ,0x0001 ), + .driver_info = (kernel_ulong_t)&gunze_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10 - {USB_DEVICE (0x0afa ,0x03e8 ), .driver_info =DEVTYPE_DMC_TSC10 }, + {USB_DEVICE (0x0afa ,0x03e8 ), + .driver_info = (kernel_ulong_t)&dmc_tsc10_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH - {USB_DEVICE (0x255e ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, - {USB_DEVICE (0x595a ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, - {USB_DEVICE (0x6615 ,0x0001 ), .driver_info =DEVTYPE_IRTOUCH }, - {USB_DEVICE (0x6615 ,0x0012 ), .driver_info =DEVTYPE_IRTOUCH_HIRES }, + {USB_DEVICE (0x255e ,0x0001 ), + .driver_info = (kernel_ulong_t)&irtouch_dev_info }, + {USB_DEVICE (0x595a ,0x0001 ), + .driver_info = (kernel_ulong_t)&irtouch_dev_info }, + {USB_DEVICE (0x6615 ,0x0001 ), + .driver_info = (kernel_ulong_t)&irtouch_dev_info }, + {USB_DEVICE (0x6615 ,0x0012 ), + .driver_info = (kernel_ulong_t)&irtouch_hires_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK - {USB_DEVICE (0x1391 ,0x1000 ), .driver_info =DEVTYPE_IDEALTEK }, + {USB_DEVICE (0x1391 ,0x1000 ), + .driver_info = (kernel_ulong_t)&idealtek_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH - {USB_DEVICE (0x0dfc ,0x0001 ), .driver_info =DEVTYPE_GENERAL_TOUCH }, + {USB_DEVICE (0x0dfc ,0x0001 ), + .driver_info = (kernel_ulong_t)&general_touch_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_GOTOP - {USB_DEVICE (0x08f2 ,0x007f ), .driver_info =DEVTYPE_GOTOP }, - {USB_DEVICE (0x08f2 ,0x00ce ), .driver_info =DEVTYPE_GOTOP }, - {USB_DEVICE (0x08f2 ,0x00f4 ), .driver_info =DEVTYPE_GOTOP }, + {USB_DEVICE (0x08f2 ,0x007f ), + .driver_info = (kernel_ulong_t)&gotop_dev_info }, + {USB_DEVICE (0x08f2 ,0x00ce ), + .driver_info = (kernel_ulong_t)&gotop_dev_info }, + {USB_DEVICE (0x08f2 ,0x00f4 ), + .driver_info = (kernel_ulong_t)&gotop_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_JASTEC - {USB_DEVICE (0x0f92 ,0x0001 ), .driver_info =DEVTYPE_JASTEC }, + {USB_DEVICE (0x0f92 ,0x0001 ), + .driver_info = (kernel_ulong_t)&jastec_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_E2I - {USB_DEVICE (0x1ac7 ,0x0001 ), .driver_info =DEVTYPE_E2I }, + {USB_DEVICE (0x1ac7 ,0x0001 ), + .driver_info = (kernel_ulong_t)&e2i_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_ZYTRONIC - {USB_DEVICE (0x14c8 ,0x0003 ), .driver_info =DEVTYPE_ZYTRONIC }, + {USB_DEVICE (0x14c8 ,0x0003 ), + .driver_info = (kernel_ulong_t)&zytronic_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC45USB/* TC5UH */ - {USB_DEVICE (0x0664 ,0x0309 ), .driver_info =DEVTYPE_TC45USB }, + {USB_DEVICE (0x0664 ,0x0309 ), + .driver_info = (kernel_ulong_t)&tc45usb_dev_info },/* TC4UM */ - {USB_DEVICE (0x0664 ,0x0306 ), .driver_info =DEVTYPE_TC45USB }, + {USB_DEVICE (0x0664 ,0x0306 ), + .driver_info = (kernel_ulong_t)&tc45usb_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_NEXIO/* data interface only */ - {USB_DEVICE_AND_INTERFACE_INFO (0x10f0 ,0x2002 ,0x0a ,0x00 ,0x00 ), - .driver_info =DEVTYPE_NEXIO }, - {USB_DEVICE_AND_INTERFACE_INFO (0x1870 ,0x0001 ,0x0a ,0x00 ,0x00 ), - .driver_info =DEVTYPE_NEXIO }, + {USB_DEVICE_AND_INTERFACE_INFO (0x10f0 ,0x2002 ,0x0a ,0x00 ,0x00 ), + .driver_info = (kernel_ulong_t)&nexio_dev_info }, + {USB_DEVICE_AND_INTERFACE_INFO (0x1870 ,0x0001 ,0x0a ,0x00 ,0x00 ), + .driver_info = (kernel_ulong_t)&nexio_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_ELO - {USB_DEVICE (0x04e7 ,0x0020 ), .driver_info =DEVTYPE_ELO }, + {USB_DEVICE (0x04e7 ,0x0020 ), + .driver_info = (kernel_ulong_t)&elo_dev_info }, #endif #ifdef CONFIG_TOUCHSCREEN_USB_EASYTOUCH - {USB_DEVICE (0x7374 ,0x0001 ), .driver_info =DEVTYPE_ETOUCH }, + {USB_DEVICE (0x7374 ,0x0001 ), + .driver_info = (kernel_ulong_t)&etouch_dev_info }, #endif - {} + { } };MODULE_DEVICE_TABLE (usb, usbtouch_devices);
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Re: [PATCH 6/8] Input: usbtouchscreen - split device info table into individual pieces
Quoted 8 lines · Dmitry Torokhov
Instead of using a single table containing information about various touchscreens and enums to match the driver ID table data with chip information define individual per-protocol instances of
usbtouch_device_infostructure and reference them directly from theusbtouch_devicesID table. This is simpler, safer, and uses less memory in case some protocols are disabled.Signed-off-by Dmitry Torokhov <[email protected]>
Dmitry Torokhov
maintainerPATCH 7/8 Input: usbtouchscreen - use guard notation when acquiring mutexes
In reply to Dmitry TorokhovThis makes the code more compact and error handling more robust.
--- drivers/input/touchscreen/usbtouchscreen.c | 65 +++++++++++----------- 1 file changed, 33 insertions(+), 32 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +33 -32
@@ -1349,6 +1349,20 @@ static void usbtouch_irq(struct urb *urb) __func__, retval); } +static int usbtouch_start_io (struct usbtouch_usb *usbtouch) +{ +guard (mutex)(&usbtouch->pm_mutex); + +if (!usbtouch->type->irq_always) +if (usb_submit_urb (usbtouch->irq,GFP_KERNEL )) +return -EIO ; + + usbtouch->interface->needs_remote_wakeup =1 ; + usbtouch->is_open = true; + +return 0 ; +} +static int usbtouch_open (struct input_dev *input) {struct usbtouch_usb *usbtouch =input_get_drvdata (input);
@@ -1357,23 +1371,12 @@ static int usbtouch_open(struct input_dev *input) usbtouch->irq->dev =interface_to_usbdev (usbtouch->interface); r =usb_autopm_get_interface (usbtouch->interface) ? -EIO :0 ; -if (r <0 ) - goto out; - -mutex_lock (&usbtouch->pm_mutex); -if (!usbtouch->type->irq_always) { -if (usb_submit_urb (usbtouch->irq,GFP_KERNEL )) { - r = -EIO ; - goto out_put; - } - } +if (r) +return r; + + r =usbtouch_start_io (usbtouch); - usbtouch->interface->needs_remote_wakeup =1 ; - usbtouch->is_open = true; -out_put: -mutex_unlock (&usbtouch->pm_mutex);usb_autopm_put_interface (usbtouch->interface); -out:return r; }
@@ -1382,11 +1385,11 @@ static void usbtouch_close(struct input_dev *input)struct usbtouch_usb *usbtouch =input_get_drvdata (input);int r; -mutex_lock (&usbtouch->pm_mutex); -if (!usbtouch->type->irq_always) -usb_kill_urb (usbtouch->irq); - usbtouch->is_open = false; -mutex_unlock (&usbtouch->pm_mutex); + scoped_guard(mutex, &usbtouch->pm_mutex) { +if (!usbtouch->type->irq_always) +usb_kill_urb (usbtouch->irq); + usbtouch->is_open = false; + } r =usb_autopm_get_interface (usbtouch->interface); usbtouch->interface->needs_remote_wakeup =0 ;
@@ -1394,8 +1397,7 @@ static void usbtouch_close(struct input_dev *input)usb_autopm_put_interface (usbtouch->interface); } -static int usbtouch_suspend -(struct usb_interface *intf,pm_message_t message) +static int usbtouch_suspend (struct usb_interface *intf,pm_message_t message) {struct usbtouch_usb *usbtouch =usb_get_intfdata (intf);
@@ -1407,20 +1409,19 @@ static int usbtouch_suspendstatic int usbtouch_resume (struct usb_interface *intf) {struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); -int result =0 ; -mutex_lock (&usbtouch->pm_mutex); +guard (mutex)(&usbtouch->pm_mutex); +if (usbtouch->is_open || usbtouch->type->irq_always) - result =usb_submit_urb (usbtouch->irq,GFP_NOIO ); -mutex_unlock (&usbtouch->pm_mutex); +return usb_submit_urb (usbtouch->irq,GFP_NOIO ); -return result; +return 0 ; }static int usbtouch_reset_resume (struct usb_interface *intf) {struct usbtouch_usb *usbtouch =usb_get_intfdata (intf); -int err =0 ; +int err;/* reinit the device */ if (usbtouch->type->init) {
@@ -1434,12 +1435,12 @@ static int usbtouch_reset_resume(struct usb_interface *intf) }/* restart IO if needed */ -mutex_lock (&usbtouch->pm_mutex); +guard (mutex)(&usbtouch->pm_mutex); +if (usbtouch->is_open) - err =usb_submit_urb (usbtouch->irq,GFP_NOIO ); -mutex_unlock (&usbtouch->pm_mutex); +return usb_submit_urb (usbtouch->irq,GFP_NOIO ); -return err; +return 0 ; } static void usbtouch_free_buffers(struct usb_device *udev,
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Re: [PATCH 7/8] Input: usbtouchscreen - use guard notation when acquiring mutexes
Quoted 6 lines · Dmitry Torokhov
This makes the code more compact and error handling more robust.
Signed-off-by Dmitry Torokhov <[email protected]>--- drivers/input/touchscreen/usbtouchscreen.c | 65 +++++++++++----------- 1 file changed, 33 insertions(+), 32 deletions(-)
Dmitry Torokhov
maintainerPATCH 8/8 Input: usbtouchscreen - switch to using __free() cleanup facility
In reply to Dmitry TorokhovUse __free(kfree) cleanup facility when allocating temporary buffers for USB transfers.
--- drivers/input/touchscreen/usbtouchscreen.c | 90 ++++++++-------------- 1 file changed, 33 insertions(+), 57 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c +33 -57
@@ -167,9 +167,8 @@ static const struct usbtouch_device_info e2i_dev_info = {static int egalax_init (struct usbtouch_usb *usbtouch) { -int ret, i; -unsigned char *buf;struct usb_device *udev =interface_to_usbdev (usbtouch->interface); +int ret, i;/* * An eGalax diagnostic packet kicks the device into using the right
@@ -177,7 +176,7 @@ static int egalax_init(struct usbtouch_usb *usbtouch)* read later and ignored. */ - buf =kmalloc (3 ,GFP_KERNEL ); + u8 *buf __free(kfree) = kmalloc(3, GFP_KERNEL);if (!buf)return -ENOMEM ;
@@ -191,17 +190,11 @@ static int egalax_init(struct usbtouch_usb *usbtouch)USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,0 , buf,3 , USB_CTRL_SET_TIMEOUT); -if (ret >=0 ) { - ret =0 ; -break ; - }if (ret != -EPIPE )break ; } -kfree (buf); - -return ret; +return ret <0 ? ret :0 ; }static int egalax_read_data (struct usbtouch_usb *dev,unsigned char *pkt)
@@ -358,10 +351,9 @@ static int mtouch_get_fw_revision(struct usbtouch_usb *usbtouch) {struct usb_device *udev =interface_to_usbdev (usbtouch->interface);struct mtouch_priv *priv = usbtouch->priv; -u8 *buf;int ret; - buf =kzalloc (MTOUCHUSB_REQ_CTRLLR_ID_LEN ,GFP_NOIO ); + u8 *buf __free(kfree) = kzalloc(MTOUCHUSB_REQ_CTRLLR_ID_LEN, GFP_NOIO);if (!buf)return -ENOMEM ;
@@ -373,18 +365,13 @@ static int mtouch_get_fw_revision(struct usbtouch_usb *usbtouch)if (ret !=MTOUCHUSB_REQ_CTRLLR_ID_LEN ) {dev_warn (&usbtouch->interface->dev,"Failed to read FW rev: %d\n" , ret); - ret = ret <0 ? ret : -EIO ; - goto free; +return ret <0 ? ret : -EIO ; } priv->fw_rev_major = buf[3 ]; priv->fw_rev_minor = buf[4 ]; - ret =0 ; - -free: -kfree (buf); -return ret; +return 0 ; }static int mtouch_alloc (struct usbtouch_usb *usbtouch)
@@ -636,24 +623,23 @@ static const struct usbtouch_device_info gunze_dev_info = {static int dmc_tsc10_init (struct usbtouch_usb *usbtouch) {struct usb_device *dev =interface_to_usbdev (usbtouch->interface); -int ret = -ENOMEM ; -unsigned char *buf; +int ret; - buf =kmalloc (2 ,GFP_NOIO ); + u8 *buf __free(kfree) = kmalloc(2, GFP_NOIO);if (!buf) - goto err_nobuf; +return -ENOMEM ; +/* reset */ buf[0 ] = buf[1 ] =0xFF ; ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), -TSC10_CMD_RESET , -USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , -0 ,0 , buf,2 ,USB_CTRL_SET_TIMEOUT ); +TSC10_CMD_RESET , +USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , +0 ,0 , buf,2 ,USB_CTRL_SET_TIMEOUT );if (ret <0 ) - goto err_out; -if (buf[0 ] !=0x06 ) { - ret = -ENODEV ; - goto err_out; - } +return ret; + +if (buf[0 ] !=0x06 ) +return -ENODEV ;/* TSC-25 data sheet specifies a delay after the RESET command */ msleep (150 );
@@ -661,28 +647,22 @@ static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)/* set coordinate output rate */ buf[0 ] = buf[1 ] =0xFF ; ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), -TSC10_CMD_RATE , -USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , -TSC10_RATE_150 ,0 , buf,2 ,USB_CTRL_SET_TIMEOUT ); +TSC10_CMD_RATE , +USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , +TSC10_RATE_150 ,0 , buf,2 ,USB_CTRL_SET_TIMEOUT );if (ret <0 ) - goto err_out; -if ((buf[0 ] !=0x06 ) && (buf[0 ] !=0x15 || buf[1 ] !=0x01 )) { - ret = -ENODEV ; - goto err_out; - } +return ret; + +if (buf[0 ] !=0x06 && (buf[0 ] !=0x15 || buf[1 ] !=0x01 )) +return -ENODEV ;/* start sending data */ - ret =usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), -TSC10_CMD_DATA1 , -USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , -0 ,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT ); -err_out: -kfree (buf); -err_nobuf: -return ret; +return usb_control_msg (dev,usb_sndctrlpipe (dev,0 ), +TSC10_CMD_DATA1 , +USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , +0 ,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT ); } -static int dmc_tsc10_read_data (struct usbtouch_usb *dev,unsigned char *pkt) { dev->x = ((pkt[2 ] &0x03 ) <<8 ) | pkt[1 ];
@@ -992,7 +972,6 @@ static int nexio_init(struct usbtouch_usb *usbtouch)struct nexio_priv *priv = usbtouch->priv;int ret = -ENOMEM ;int actual_len, i; -unsigned char *buf;char *firmware_ver =NULL , *device_name =NULL ;int input_ep =0 , output_ep =0 ;
@@ -1008,9 +987,9 @@ static int nexio_init(struct usbtouch_usb *usbtouch)if (!input_ep || !output_ep)return -ENXIO ; - buf =kmalloc (NEXIO_BUFSIZE ,GFP_NOIO ); + u8 *buf __free(kfree) = kmalloc(NEXIO_BUFSIZE, GFP_NOIO);if (!buf) - goto out_buf; +return -ENOMEM ;/* two empty reads */ for (i =0 ; i <2 ; i++) {
@@ -1018,7 +997,7 @@ static int nexio_init(struct usbtouch_usb *usbtouch) buf,NEXIO_BUFSIZE , &actual_len, NEXIO_TIMEOUT);if (ret <0 ) - goto out_buf; +return ret; }/* send init command */
@@ -1027,7 +1006,7 @@ static int nexio_init(struct usbtouch_usb *usbtouch) buf,sizeof (nexio_init_pkt), &actual_len, NEXIO_TIMEOUT);if (ret <0 ) - goto out_buf; +return ret;/* read replies */ for (i =0 ; i <3 ; i++) {
@@ -1058,11 +1037,8 @@ static int nexio_init(struct usbtouch_usb *usbtouch)usb_fill_bulk_urb (priv->ack, dev,usb_sndbulkpipe (dev, output_ep), priv->ack_buf,sizeof (nexio_ack_pkt), nexio_ack_complete, usbtouch); - ret =0 ; -out_buf: -kfree (buf); -return ret; +return 0 ; }static void nexio_exit (struct usbtouch_usb *usbtouch)
Signature · 1 line
2.45.2.993.g49e7a77208-goog
Re: [PATCH 8/8] Input: usbtouchscreen - switch to using __free() cleanup facility
Quoted 38 lines · Dmitry Torokhov
Use
__free(kfree)cleanup facility when allocating temporary buffers for USB transfers.Signed-off-by Dmitry Torokhov <[email protected]>--- drivers/input/touchscreen/usbtouchscreen.c | 90 ++++++++-------------- 1 file changed, 33 insertions(+), 57 deletions(-)drivers/input/touchscreen/usbtouchscreen.c +2
-5@@ -167,9 +167,8 @@ static const struct usbtouch_device_info e2i_dev_info = {static int egalax_init (struct usbtouch_usb *usbtouch) { -int ret, i; -unsigned char *buf;struct usb_device *udev =interface_to_usbdev (usbtouch->interface); +int ret, i;/* * An eGalax diagnostic packet kicks the device into using the right @@ -177,7 +176,7 @@ static int egalax_init(struct usbtouch_usb *usbtouch)* read later and ignored. */ - buf =kmalloc (3 ,GFP_KERNEL ); + u8 *buf __free(kfree) = kmalloc(3, GFP_KERNEL);if (!buf)return -ENOMEM ;@@ -191,17 +190,11 @@ static int egalax_init(struct usbtouch_usb *usbtouch)USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0 ,0 , buf,3 , USB_CTRL_SET_TIMEOUT); -if (ret >=0 ) { - ret =0 ;
drivers/input/touchscreen/usbtouchscreen.c static int egalax_init(struct usbtouch_usb *usbtouch) · line 197
Quoted 10 lines
drivers/input/touchscreen/usbtouchscreen.c +1
-5-break ; - }if (ret != -EPIPE )break ; } -kfree (buf); - -return ret; +return ret <0 ? ret :0 ;
Personally I hate ? : usage, but it's your subsystem and it's used elsewhere in this file, so you have to live with it :)
Quoted 49 lines
drivers/input/touchscreen/usbtouchscreen.c +6
-13}static int egalax_read_data (struct usbtouch_usb *dev,unsigned char *pkt)@@ -358,10 +351,9 @@ static int mtouch_get_fw_revision(struct usbtouch_usb *usbtouch) {struct usb_device *udev =interface_to_usbdev (usbtouch->interface);struct mtouch_priv *priv = usbtouch->priv; -u8 *buf;int ret; - buf =kzalloc (MTOUCHUSB_REQ_CTRLLR_ID_LEN ,GFP_NOIO ); + u8 *buf __free(kfree) = kzalloc(MTOUCHUSB_REQ_CTRLLR_ID_LEN, GFP_NOIO);if (!buf)return -ENOMEM ;@@ -373,18 +365,13 @@ static int mtouch_get_fw_revision(struct usbtouch_usb *usbtouch)if (ret !=MTOUCHUSB_REQ_CTRLLR_ID_LEN ) {dev_warn (&usbtouch->interface->dev,"Failed to read FW rev: %d\n" , ret); - ret = ret <0 ? ret : -EIO ; - goto free; +return ret <0 ? ret : -EIO ; } priv->fw_rev_major = buf[3 ]; priv->fw_rev_minor = buf[4 ]; - ret =0 ; - -free: -kfree (buf); -return ret; +return 0 ; }static int mtouch_alloc (struct usbtouch_usb *usbtouch)@@ -636,24 +623,23 @@ static const struct usbtouch_device_info gunze_dev_info = {static int dmc_tsc10_init (struct usbtouch_usb *usbtouch) {struct usb_device *dev =interface_to_usbdev (usbtouch->interface); -int ret = -ENOMEM ; -unsigned char *buf; +int ret; - buf =kmalloc (2 ,GFP_NOIO ); + u8 *buf __free(kfree) = kmalloc(2, GFP_NOIO);if (!buf) - goto err_nobuf; +return -ENOMEM ;
drivers/input/touchscreen/usbtouchscreen.c static const struct usbtouch_device_info gunze_dev_info = { · line 637
Quoted 10 lines
drivers/input/touchscreen/usbtouchscreen.c +4
-3+/* reset */ buf[0 ] = buf[1 ] =0xFF ; ret =usb_control_msg (dev,usb_rcvctrlpipe (dev,0 ), -TSC10_CMD_RESET , -USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , -0 ,0 , buf,2 ,USB_CTRL_SET_TIMEOUT ); +TSC10_CMD_RESET , +USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , +0 ,0 , buf,2 ,USB_CTRL_SET_TIMEOUT );
Unintentional whitespace change?
Anyway, not a big deal, cleanup looks good:
Quoted 8 lines · Dmitry Torokhov
Instead of manually creating driver-specific device attributes set struct
usb_driver->dev_groupspointer to have the driver core do it.Signed-off-by Dmitry Torokhov <[email protected]>--- drivers/input/touchscreen/usbtouchscreen.c | 31 +++++++++++++++------- 1 file changed, 21 insertions(+), 10 deletions(-)