Merge tag 'renesas-sh-drivers-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / hid / hid-roccat-arvo.c

diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c
index 1948208..329c5d1 100644 (file)
--- 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;