2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index a6e24e00a37b..9d75205a511e 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2077,7 +2077,7 @@ struct hid_dynid {
 static ssize_t store_new_id(struct device_driver *drv, const char *buf,
                 size_t count)
 {
-        struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);
+        struct hid_driver *hdrv = to_hid_driver(drv);
         struct hid_dynid *dynid;
         __u32 bus, vendor, product;
         unsigned long driver_data = 0;
@@ -2139,7 +2139,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_driver *hdrv = to_hid_driver(drv);
         struct hid_device *hdev = to_hid_device(dev);
 
         return hid_match_device(hdev, hdrv) != NULL;
@@ -2147,8 +2147,7 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv)
 
 static int hid_device_probe(struct device *dev)
 {
-        struct hid_driver *hdrv = container_of(dev->driver,
-                        struct hid_driver, driver);
+        struct hid_driver *hdrv = to_hid_driver(dev->driver);
         struct hid_device *hdev = to_hid_device(dev);
         const struct hid_device_id *id;
         int ret = 0;
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 1472026367ed..75b66eccc692 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -717,6 +717,9 @@ struct hid_driver {
         struct device_driver driver;
 };
 
+#define to_hid_driver(pdrv) \
+        container_of(pdrv, struct hid_driver, driver)
+
 /**
  * hid_ll_driver - low level driver callbacks
  * @start: called on probe to start the device