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

HID: move to_hid_device() to hid.h 



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: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0b1804e3

drivers/hid/hid-lg4ff.c

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/hid/hid-logitech-hidpp.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

{

include/linux/hid.h

+3 −0
Original line number Diff line number Diff line
@@ -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);