[PATCH 5/5] HID: use kobj_to_dev()

[Geliang Tang]

Use kobj_to_dev() instead of open-coding it.

Signed-off-by: Geliang Tang 
---
 drivers/hid/hid-core.c|  2 +-
 drivers/hid/hid-roccat-arvo.c |  6 ++
 drivers/hid/hid-roccat-common.c   |  6 ++
 drivers/hid/hid-roccat-isku.c |  6 ++
 drivers/hid/hid-roccat-kone.c | 12 
 drivers/hid/hid-roccat-koneplus.c | 12 
 drivers/hid/hid-roccat-kovaplus.c | 12 
 drivers/hid/hid-roccat-lua.c  |  4 ++--
 drivers/hid/hid-roccat-pyra.c | 15 +--
 drivers/hid/wacom_sys.c   |  4 ++--
 10 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index ecf614b..afbf39d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -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)
diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c
index 1948208..329c5d1 100644
--- a/drivers/hid/hid-roccat-arvo.c
+++ b/drivers/hid/hid-roccat-arvo.c
@@ -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;
diff --git a/drivers/hid/hid-roccat-common.c b/drivers/hid/hid-roccat-common.c
index 02e28e9..8155ac5 100644
--- a/drivers/hid/hid-roccat-common.c
+++ b/drivers/hid/hid-roccat-common.c
@@ -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;
diff --git a/drivers/hid/hid-roccat-isku.c b/drivers/hid/hid-roccat-isku.c
index bc62ed9..02db537 100644
--- a/drivers/hid/hid-roccat-isku.c
+++ b/drivers/hid/hid-roccat-isku.c
@@ -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 = 

[PATCH 5/5] HID: use kobj_to_dev()

[Geliang Tang]

Use kobj_to_dev() instead of open-coding it.

Signed-off-by: Geliang Tang 
---
 drivers/hid/hid-core.c|  2 +-
 drivers/hid/hid-roccat-arvo.c |  6 ++
 drivers/hid/hid-roccat-common.c   |  6 ++
 drivers/hid/hid-roccat-isku.c |  6 ++
 drivers/hid/hid-roccat-kone.c | 12 
 drivers/hid/hid-roccat-koneplus.c | 12 
 drivers/hid/hid-roccat-kovaplus.c | 12 
 drivers/hid/hid-roccat-lua.c  |  4 ++--
 drivers/hid/hid-roccat-pyra.c | 15 +--
 drivers/hid/wacom_sys.c   |  4 ++--
 10 files changed, 28 insertions(+), 51 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index ecf614b..afbf39d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -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)
diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c
index 1948208..329c5d1 100644
--- a/drivers/hid/hid-roccat-arvo.c
+++ b/drivers/hid/hid-roccat-arvo.c
@@ -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;
diff --git a/drivers/hid/hid-roccat-common.c b/drivers/hid/hid-roccat-common.c
index 02e28e9..8155ac5 100644
--- a/drivers/hid/hid-roccat-common.c
+++ b/drivers/hid/hid-roccat-common.c
@@ -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;
diff --git a/drivers/hid/hid-roccat-isku.c b/drivers/hid/hid-roccat-isku.c
index bc62ed9..02db537 100644
--- a/drivers/hid/hid-roccat-isku.c
+++ b/drivers/hid/hid-roccat-isku.c
@@ -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 =