HID: move to_hid_device() to hid.h

geliangtang · Jiri Kosina · commit d8ce9bf5551b · 2015-12-28T13:41:11.000+01:00
to_hid_device() macro is defined in both hid-lg4ff.c and
hid-logitech-hidpp.c. So I move it to include/linux/hid.h.

Signed-off-by: Geliang Tang &lt;geliangtang@163.com&gt;
Signed-off-by: Jiri Kosina &lt;jkosina@suse.cz&gt;
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
@@ -33,8 +33,6 @@
 #include "hid-lg4ff.h"
 #include "hid-ids.h"
 
-#define to_hid_device(pdev) container_of(pdev, struct hid_device, dev)
-
 #define LG4FF_MMODE_IS_MULTIMODE 0
 #define LG4FF_MMODE_SWITCHED 1
 #define LG4FF_MMODE_NOT_MULTIMODE 2
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
@@ -1310,8 +1310,6 @@ struct g920_private_data {
 	u16 range;
 };
 
-#define to_hid_device(pdev) container_of(pdev, struct hid_device, dev)
-
 static ssize_t g920_range_show(struct device *dev, struct device_attribute *attr,
 				char *buf)
 {
diff --git a/include/linux/hid.h b/include/linux/hid.h
@@ -565,6 +565,9 @@ struct hid_device {							/* device report descriptor */
 	wait_queue_head_t debug_wait;
 };
 
+#define to_hid_device(pdev) \
+	container_of(pdev, struct hid_device, dev)
+
 static inline void *hid_get_drvdata(struct hid_device *hdev)
 {
 	return dev_get_drvdata(&hdev->dev);

Original file line number	Diff line number	Diff line change
`@@ -1310,8 +1310,6 @@ struct g920_private_data {`
`1310`	`1310`	`u16 range;`
`1311`	`1311`	`};`
`1312`	`1312`
`1313`		`-#define to_hid_device(pdev) container_of(pdev, struct hid_device, dev)`
`1314`		`-`
`1315`	`1313`	`static ssize_t g920_range_show(struct device dev, struct device_attribute attr,`
`1316`	`1314`	`char *buf)`
`1317`	`1315`	`{`
Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,9 @@ struct hid_device { /* device report descriptor */`
`565`	`565`	`wait_queue_head_t debug_wait;`
`566`	`566`	`};`
`567`	`567`
	`568`	`+#define to_hid_device(pdev) \`
	`569`	`+ container_of(pdev, struct hid_device, dev)`
	`570`	`+`
`568`	`571`	`static inline void hid_get_drvdata(struct hid_device hdev)`
`569`	`572`	`{`
`570`	`573`	`return dev_get_drvdata(&hdev->dev);`