Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

HID: use kobj_to_dev() 



Use kobj_to_dev() instead of open-coding it.

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

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1571,7 +1571,7 @@ read_report_descriptor(struct file *filp, struct kobject *kobj, 
		struct bin_attribute *attr,

		char *buf, loff_t off, size_t count)

{

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

	struct device *dev = kobj_to_dev(kobj);

	struct hid_device *hdev = to_hid_device(dev);



	if (off >= hdev->rsize)

drivers/hid/hid-roccat-arvo.c

+2 −4
Original line number Diff line number Diff line
@@ -191,8 +191,7 @@ static ssize_t arvo_sysfs_write(struct file *fp, 
		struct kobject *kobj, void const *buf,

		loff_t off, size_t count, size_t real_size, uint command)

{

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct arvo_device *arvo = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	int retval;
@@ -211,8 +210,7 @@ static ssize_t arvo_sysfs_read(struct file *fp, 
		struct kobject *kobj, void *buf, loff_t off,

		size_t count, size_t real_size, uint command)

{

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct arvo_device *arvo = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	int retval;

drivers/hid/hid-roccat-common.c

+2 −4
Original line number Diff line number Diff line
@@ -134,8 +134,7 @@ ssize_t roccat_common2_sysfs_read(struct file *fp, struct kobject *kobj, 
		char *buf, loff_t off, size_t count,

		size_t real_size, uint command)

{

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct roccat_common2_device *roccat_dev = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	int retval;
@@ -158,8 +157,7 @@ ssize_t roccat_common2_sysfs_write(struct file *fp, struct kobject *kobj, 
		void const *buf, loff_t off, size_t count,

		size_t real_size, uint command)

{

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct roccat_common2_device *roccat_dev = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	int retval;

drivers/hid/hid-roccat-isku.c

+2 −4
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ static ssize_t isku_sysfs_read(struct file *fp, struct kobject *kobj, 
		char *buf, loff_t off, size_t count,

		size_t real_size, uint command)

{

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct isku_device *isku = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	int retval;
@@ -144,8 +143,7 @@ static ssize_t isku_sysfs_write(struct file *fp, struct kobject *kobj, 
		void const *buf, loff_t off, size_t count,

		size_t real_size, uint command)

{

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct isku_device *isku = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	int retval;

drivers/hid/hid-roccat-kone.c

+4 −8
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ static int kone_get_firmware_version(struct usb_device *usb_dev, int *result) 
static ssize_t kone_sysfs_read_settings(struct file *fp, struct kobject *kobj,

		struct bin_attribute *attr, char *buf,

		loff_t off, size_t count) {

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev));



	if (off >= sizeof(struct kone_settings))
@@ -294,8 +293,7 @@ static ssize_t kone_sysfs_read_settings(struct file *fp, struct kobject *kobj, 
static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj,

		struct bin_attribute *attr, char *buf,

		loff_t off, size_t count) {

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	int retval = 0, difference, old_profile;
@@ -332,8 +330,7 @@ static BIN_ATTR(settings, 0660, kone_sysfs_read_settings, 
static ssize_t kone_sysfs_read_profilex(struct file *fp,

		struct kobject *kobj, struct bin_attribute *attr,

		char *buf, loff_t off, size_t count) {

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev));



	if (off >= sizeof(struct kone_profile))
@@ -353,8 +350,7 @@ static ssize_t kone_sysfs_read_profilex(struct file *fp, 
static ssize_t kone_sysfs_write_profilex(struct file *fp,

		struct kobject *kobj, struct bin_attribute *attr,

		char *buf, loff_t off, size_t count) {

	struct device *dev =

			container_of(kobj, struct device, kobj)->parent->parent;

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct kone_device *kone = hid_get_drvdata(dev_get_drvdata(dev));

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));

	struct kone_profile *profile;