HID: picolcd: fix build error if !CONFIG_DEBUG_FS
authorAxel Lin <axel.lin@gmail.com>
Tue, 11 Sep 2012 12:29:53 +0000 (20:29 +0800)
committerJiri Kosina <jkosina@suse.cz>
Tue, 11 Sep 2012 14:06:22 +0000 (16:06 +0200)
Current code missed the definition for picolcd_debug_out_report, but add
definition for picolcd_debug_raw_event twice.

This patch fixes below build error:
  CC [M]  drivers/hid/hid-picolcd_core.o
In file included from drivers/hid/hid-picolcd_core.c:34:0:
drivers/hid/hid-picolcd.h:176:20: error: redefinition of 'picolcd_debug_raw_event'
drivers/hid/hid-picolcd.h:162:20: note: previous definition of 'picolcd_debug_raw_event' was here
make[2]: *** [drivers/hid/hid-picolcd_core.o] Error 1
make[1]: *** [drivers/hid] Error 2
make: *** [drivers] Error 2

if CONFIG_DEBUG_FS is unset.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-picolcd.h

index 240eb1cd872eea89d3a5dd6854c165990f7849d6..020cef69f6a13e07df8d8f9911b4c060b0773461 100644 (file)
@@ -159,6 +159,10 @@ void picolcd_init_devfs(struct picolcd_data *data,
 
 void picolcd_exit_devfs(struct picolcd_data *data);
 #else
+static inline void picolcd_debug_out_report(struct picolcd_data *data,
+               struct hid_device *hdev, struct hid_report *report)
+{
+}
 static inline void picolcd_debug_raw_event(struct picolcd_data *data,
                struct hid_device *hdev, struct hid_report *report,
                u8 *raw_data, int size)
@@ -173,11 +177,6 @@ static inline void picolcd_init_devfs(struct picolcd_data *data,
 static inline void picolcd_exit_devfs(struct picolcd_data *data)
 {
 }
-static inline void picolcd_debug_raw_event(struct picolcd_data *data,
-               struct hid_device *hdev, struct hid_report *report,
-               u8 *raw_data, int size)
-{
-}
 #endif /* CONFIG_DEBUG_FS */