[PATCH 1/5] HID: move to_hid_device() to hid.h

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Geliang Tang <geliangtang@163.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/5] HID: move to_hid_device() to hid.h
Date	Sun, 27 Dec 2015 10:30:01 +0100
Message-ID	<qKfOh-52f-5@gated-at.bofh.it> (permalink)
X-Original-To	Jiri Kosina <jikos@kernel.org>, Benjamin Tissoires <benjamin.tissoires@redhat.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=GuhVqbjkwxzAYXOvAD sskAlb39gdqzg4JfULLxu3qJw=; b=RjgTFdanxTUCdiMWl9rwgL0+xI1YsVuYcF /2NuaSoEDVbtMpey/HuAvJYSBJvQ2XA60ud837pet5Hz7grYcTUePWZ3fHnHOJhk vdMFgdpfr1r49bonLKOgCTp97ctQkDtn0fsOooWH1H5tJZzR6I2gXUoUeqT6r7aZ dU+2eifpw=
X-Mailer	git-send-email 2.5.0
X-Cm-Transid	DNGowECJOkiHrn9W_a8LAA--.4082S3
X-Coremail-Antispam	1Uf129KBjvJXoW7ZF17tFyUCr1rCry3Xr1xAFb_yoW8Ww4kpF 4DGa92krWUGr47Gw1DGw1rCa43J3WkCa4I9ry2k34ruFyayF90qrnxta4qyrnYqFWktrW3 GFsxJr4UGa409w7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UonQUUUUUU=
X-Originating-IP	[116.77.145.148]
X-Cm-Senderinfo	5jhoxtpqjwt0rj6rljoofrz/1tbiMAndmVWBTXxRBAAAsN
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	59
Organization	linux.* mail to news gateway
X-Original-Cc	Geliang Tang <geliangtang@163.com>, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Sun, 27 Dec 2015 17:25:20 +0800
X-Original-Message-ID	<3490fef13d9af010ff2da07012eed189c46ee3fa.1451206516.git.geliangtang@163.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1298333

Show key headers only | View raw

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 <geliangtang@163.com>
---
 drivers/hid/hid-lg4ff.c          | 2 --
 drivers/hid/hid-logitech-hidpp.c | 2 --
 include/linux/hid.h              | 3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
index fbddcb3..3e160ff 100644
--- 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
index f2a4811..bd2ab476 100644
--- 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
index a6d7a3f..1472026 100644
--- 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);
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/5] HID: move to_hid_device() to hid.h Geliang Tang <geliangtang@163.com> - 2015-12-27 10:30 +0100
  [PATCH 5/5] HID: use kobj_to_dev() Geliang Tang <geliangtang@163.com> - 2015-12-27 10:30 +0100
  [PATCH 3/5] HID: add a new helper to_hid_driver() Geliang Tang <geliangtang@163.com> - 2015-12-27 10:30 +0100
  [PATCH 2/5] HID: use to_hid_device() Geliang Tang <geliangtang@163.com> - 2015-12-27 10:30 +0100
  Re: [PATCH 1/5] HID: move to_hid_device() to hid.h Jiri Kosina <jikos@kernel.org> - 2015-12-28 13:50 +0100

csiph-web