Commit ee79a8f8 authored by Geliang Tang's avatar Geliang Tang Committed by Jiri Kosina
Browse files

HID: use to_hid_device() 



Use to_hid_device() instead of container_of().

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d8ce9bf5

drivers/hid/hid-core.c

+7 −7
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static void hid_close_report(struct hid_device *device) 


static void hid_device_release(struct device *dev)

{

	struct hid_device *hid = container_of(dev, struct hid_device, dev);

	struct hid_device *hid = to_hid_device(dev);



	hid_close_report(hid);

	kfree(hid->dev_rdesc);
@@ -1572,7 +1572,7 @@ read_report_descriptor(struct file *filp, struct kobject *kobj, 
		char *buf, loff_t off, size_t count)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);



	if (off >= hdev->rsize)

		return 0;
@@ -1589,7 +1589,7 @@ static ssize_t 
show_country(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);



	return sprintf(buf, "%02x\n", hdev->country & 0xff);

}
@@ -2140,7 +2140,7 @@ static const struct hid_device_id *hid_match_device(struct hid_device *hdev, 
static int hid_bus_match(struct device *dev, struct device_driver *drv)

{

	struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);



	return hid_match_device(hdev, hdrv) != NULL;

}
@@ -2149,7 +2149,7 @@ static int hid_device_probe(struct device *dev) 
{

	struct hid_driver *hdrv = container_of(dev->driver,

			struct hid_driver, driver);

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	const struct hid_device_id *id;

	int ret = 0;
@@ -2191,7 +2191,7 @@ unlock_driver_lock: 


static int hid_device_remove(struct device *dev)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct hid_driver *hdrv;

	int ret = 0;
@@ -2241,7 +2241,7 @@ ATTRIBUTE_GROUPS(hid_dev); 


static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);	



	if (add_uevent_var(env, "HID_ID=%04X:%08X:%08X",

			hdev->bus, hdev->vendor, hdev->product))

drivers/hid/hid-cp2112.c

+4 −4
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static ssize_t name##_store(struct device *kdev, \ 
			    struct device_attribute *attr, const char *buf, \

			    size_t count) \

{ \

	struct hid_device *hdev = container_of(kdev, struct hid_device, dev); \

	struct hid_device *hdev = to_hid_device(kdev); \

	struct cp2112_usb_config_report cfg; \

	int ret = cp2112_get_usb_config(hdev, &cfg); \

	if (ret) \
@@ -822,7 +822,7 @@ static ssize_t name##_store(struct device *kdev, \ 
static ssize_t name##_show(struct device *kdev, \

			   struct device_attribute *attr, char *buf) \

{ \

	struct hid_device *hdev = container_of(kdev, struct hid_device, dev); \

	struct hid_device *hdev = to_hid_device(kdev); \

	struct cp2112_usb_config_report cfg; \

	int ret = cp2112_get_usb_config(hdev, &cfg); \

	if (ret) \
@@ -887,7 +887,7 @@ static ssize_t pstr_store(struct device *kdev, 
			  struct device_attribute *kattr, const char *buf,

			  size_t count)

{

	struct hid_device *hdev = container_of(kdev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(kdev);

	struct cp2112_pstring_attribute *attr =

		container_of(kattr, struct cp2112_pstring_attribute, attr);

	struct cp2112_string_report report;
@@ -918,7 +918,7 @@ static ssize_t pstr_store(struct device *kdev, 
static ssize_t pstr_show(struct device *kdev,

			 struct device_attribute *kattr, char *buf)

{

	struct hid_device *hdev = container_of(kdev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(kdev);

	struct cp2112_pstring_attribute *attr =

		container_of(kattr, struct cp2112_pstring_attribute, attr);

	struct cp2112_string_report report;

drivers/hid/hid-gt683r.c

+3 −5
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void gt683r_brightness_set(struct led_classdev *led_cdev, 
{

	int i;

	struct device *dev = led_cdev->dev->parent;

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct gt683r_led *led = hid_get_drvdata(hdev);



	for (i = 0; i < GT683R_LED_COUNT; i++) {
@@ -89,8 +89,7 @@ static ssize_t mode_show(struct device *dev, 
				char *buf)

{

	u8 sysfs_mode;

	struct hid_device *hdev = container_of(dev->parent,

					struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev->parent);

	struct gt683r_led *led = hid_get_drvdata(hdev);



	if (led->mode == GT683R_LED_NORMAL)
@@ -108,8 +107,7 @@ static ssize_t mode_store(struct device *dev, 
				const char *buf, size_t count)

{

	u8 sysfs_mode;

	struct hid_device *hdev = container_of(dev->parent,

					struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev->parent);

	struct gt683r_led *led = hid_get_drvdata(hdev);

drivers/hid/hid-lenovo.c

+18 −18
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static ssize_t attr_fn_lock_show_cptkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_cptkbd *cptkbd_data = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n", cptkbd_data->fn_lock);
@@ -231,7 +231,7 @@ static ssize_t attr_fn_lock_store_cptkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_cptkbd *cptkbd_data = hid_get_drvdata(hdev);

	int value;
@@ -250,7 +250,7 @@ static ssize_t attr_sensitivity_show_cptkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_cptkbd *cptkbd_data = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -262,7 +262,7 @@ static ssize_t attr_sensitivity_store_cptkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_cptkbd *cptkbd_data = hid_get_drvdata(hdev);

	int value;
@@ -387,7 +387,7 @@ static ssize_t attr_press_to_select_show_tpkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n", data_pointer->press_to_select);
@@ -398,7 +398,7 @@ static ssize_t attr_press_to_select_store_tpkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	int value;
@@ -417,7 +417,7 @@ static ssize_t attr_dragging_show_tpkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n", data_pointer->dragging);
@@ -428,7 +428,7 @@ static ssize_t attr_dragging_store_tpkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	int value;
@@ -447,7 +447,7 @@ static ssize_t attr_release_to_select_show_tpkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n", data_pointer->release_to_select);
@@ -458,7 +458,7 @@ static ssize_t attr_release_to_select_store_tpkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	int value;
@@ -477,7 +477,7 @@ static ssize_t attr_select_right_show_tpkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n", data_pointer->select_right);
@@ -488,7 +488,7 @@ static ssize_t attr_select_right_store_tpkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	int value;
@@ -507,7 +507,7 @@ static ssize_t attr_sensitivity_show_tpkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -519,7 +519,7 @@ static ssize_t attr_sensitivity_store_tpkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	int value;
@@ -536,7 +536,7 @@ static ssize_t attr_press_speed_show_tpkbd(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);



	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -548,7 +548,7 @@ static ssize_t attr_press_speed_store_tpkbd(struct device *dev, 
		const char *buf,

		size_t count)

{

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	int value;
@@ -609,7 +609,7 @@ static enum led_brightness lenovo_led_brightness_get_tpkbd( 
			struct led_classdev *led_cdev)

{

	struct device *dev = led_cdev->dev->parent;

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	int led_nr = 0;
@@ -625,7 +625,7 @@ static void lenovo_led_brightness_set_tpkbd(struct led_classdev *led_cdev, 
			enum led_brightness value)

{

	struct device *dev = led_cdev->dev->parent;

	struct hid_device *hdev = container_of(dev, struct hid_device, dev);

	struct hid_device *hdev = to_hid_device(dev);

	struct lenovo_drvdata_tpkbd *data_pointer = hid_get_drvdata(hdev);

	struct hid_report *report;

	int led_nr = 0;

drivers/hid/hid-lg4ff.c

+2 −2
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ static void lg4ff_led_set_brightness(struct led_classdev *led_cdev, 
			enum led_brightness value)

{

	struct device *dev = led_cdev->dev->parent;

	struct hid_device *hid = container_of(dev, struct hid_device, dev);

	struct hid_device *hid = to_hid_device(dev);

	struct lg_drv_data *drv_data = hid_get_drvdata(hid);

	struct lg4ff_device_entry *entry;

	int i, state = 0;
@@ -1053,7 +1053,7 @@ static void lg4ff_led_set_brightness(struct led_classdev *led_cdev, 
static enum led_brightness lg4ff_led_get_brightness(struct led_classdev *led_cdev)

{

	struct device *dev = led_cdev->dev->parent;

	struct hid_device *hid = container_of(dev, struct hid_device, dev);

	struct hid_device *hid = to_hid_device(dev);

	struct lg_drv_data *drv_data = hid_get_drvdata(hid);

	struct lg4ff_device_entry *entry;

	int i, value = 0;