Input: introduce usb_to_input_id() to uniformly produce (16a334c0) · Commits · 戴 / test

drivers/usb/input/acecad.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/usb.h>
		#include <linux/usb_input.h>

		/*
		* Version Information
		@@ -212,10 +213,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_

		acecad->dev.name = acecad->name;
		acecad->dev.phys = acecad->phys;
		acecad->dev.id.bustype = BUS_USB;
		acecad->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
		acecad->dev.id.product = le16_to_cpu(dev->descriptor.idProduct);
		acecad->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
		usb_to_input_id(dev, &acecad->dev.id);
		acecad->dev.dev = &intf->dev;

		usb_fill_int_urb(acecad->irq, dev, pipe,

+2 −4

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/usb.h>
		#include <linux/usb_input.h>
		#include <linux/sched.h>
		#include <asm/uaccess.h>
		#include <asm/unaligned.h>
		@@ -2125,10 +2126,7 @@ aiptek_probe(struct usb_interface intf, const struct usb_device_id id)
		aiptek->inputdev.absflat[ABS_WHEEL] = 0;
		aiptek->inputdev.name = "Aiptek";
		aiptek->inputdev.phys = aiptek->features.usbPath;
		aiptek->inputdev.id.bustype = BUS_USB;
		aiptek->inputdev.id.vendor = le16_to_cpu(usbdev->descriptor.idVendor);
		aiptek->inputdev.id.product = le16_to_cpu(usbdev->descriptor.idProduct);
		aiptek->inputdev.id.version = le16_to_cpu(usbdev->descriptor.bcdDevice);
		usb_to_input_id(usbdev, &aiptek->inputdev.id);
		aiptek->inputdev.dev = &intf->dev;

		aiptek->usbdev = usbdev;

+3 −5

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@
		#include <linux/moduleparam.h>
		#include <linux/input.h>
		#include <linux/usb.h>
		#include <linux/usb_input.h>
		#include <linux/wait.h>

		/*
		@@ -635,11 +636,8 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
		idev->name = ati_remote->name;
		idev->phys = ati_remote->phys;

		idev->id.bustype = BUS_USB;
		idev->id.vendor = le16_to_cpu(ati_remote->udev->descriptor.idVendor);
		idev->id.product = le16_to_cpu(ati_remote->udev->descriptor.idProduct);
		idev->id.version = le16_to_cpu(ati_remote->udev->descriptor.bcdDevice);
		idev->dev = &(ati_remote->udev->dev);
		usb_to_input_id(ati_remote->udev, &idev->id);
		idev->dev = &ati_remote->udev->dev;
		}

		static int ati_remote_initialize(struct ati_remote *ati_remote)

+2 −4

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <linux/kernel.h>
		#include <linux/input.h>
		#include <linux/usb.h>
		#include <linux/usb_input.h>

		#undef DEBUG

		@@ -581,10 +582,7 @@ int hidinput_connect(struct hid_device *hid)
		hidinput->input.name = hid->name;
		hidinput->input.phys = hid->phys;
		hidinput->input.uniq = hid->uniq;
		hidinput->input.id.bustype = BUS_USB;
		hidinput->input.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
		hidinput->input.id.product = le16_to_cpu(dev->descriptor.idProduct);
		hidinput->input.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
		usb_to_input_id(dev, &hidinput->input.id);
		hidinput->input.dev = &hid->intf->dev;
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/usb.h>
		#include <linux/usb_input.h>

		/* only an 8 byte buffer necessary for a single packet */
		#define ITM_BUFSIZE 8
		@@ -184,10 +185,7 @@ static int itmtouch_probe(struct usb_interface *intf, const struct usb_device_id

		itmtouch->inputdev.name = itmtouch->name;
		itmtouch->inputdev.phys = itmtouch->phys;
		itmtouch->inputdev.id.bustype = BUS_USB;
		itmtouch->inputdev.id.vendor = udev->descriptor.idVendor;
		itmtouch->inputdev.id.product = udev->descriptor.idProduct;
		itmtouch->inputdev.id.version = udev->descriptor.bcdDevice;
		usb_to_input_id(udev, &itmtouch->inputdev.id);
		itmtouch->inputdev.dev = &intf->dev;

		if (!strlen(itmtouch->name))