From patchwork Tue Sep 11 12:29:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: axel lin X-Patchwork-Id: 1437391 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E6013DFAF3 for ; Tue, 11 Sep 2012 12:30:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751463Ab2IKMaD (ORCPT ); Tue, 11 Sep 2012 08:30:03 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:44478 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751172Ab2IKMaC (ORCPT ); Tue, 11 Sep 2012 08:30:02 -0400 Received: by oago6 with SMTP id o6so190286oag.19 for ; Tue, 11 Sep 2012 05:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=NIuLBhayLASxZlLzt6REZNzxhjtjT28fDA5ZS2BUoTs=; b=fpRCQgBanI4Ierj1LoRrhDhEpi1jAcYhxpjSMHJyFpcAvG2fbR60pxkYFg/1cBK1AV P2pkQ5KNU+1BvHU8LaliZ4Ch+fj6S1cF2AUL+KLgBaEw7JFhnvo4B0AwDvvFHNw+eAFn PKHyTRNj2rSckyfT/dF8Uxk/GMVENZ9vSw4gzSWckMhtYAQ6Bus0PxRpwMEzDcQyY3Rx jGK8TqMeO+PRJN7LOMv+sxR1udI0H6fYz7WMJ40C2sG/Z0KJcry3BTyzuZFRASDiLFzQ kfjQ111TtsNswGzI4In4cHQ0VWRgL21YzMflqiw1esiAGH+JyJI+9DDzfWbvg81I7FxA Rbew== Received: by 10.60.22.169 with SMTP id e9mr17669569oef.124.1347366601155; Tue, 11 Sep 2012 05:30:01 -0700 (PDT) Received: from [122.121.48.72] (122-121-48-72.dynamic.hinet.net. [122.121.48.72]) by mx.google.com with ESMTPS id 5sm11295605oeq.4.2012.09.11.05.29.58 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Sep 2012 05:30:00 -0700 (PDT) Message-ID: <1347366593.7690.1.camel@phoenix> Subject: [PATCH] HID: picolcd: Fix build error due to redefinition of 'picolcd_debug_raw_event' From: Axel Lin To: Jiri Kosina Cc: Bruno =?ISO-8859-1?Q?Pr=E9mont?= , linux-input@vger.kernel.org Date: Tue, 11 Sep 2012 20:29:53 +0800 X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Current code missed the definition for picolcd_debug_raw_event, 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 Signed-off-by: Axel Lin --- drivers/hid/hid-picolcd.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-picolcd.h b/drivers/hid/hid-picolcd.h index 240eb1c..020cef6 100644 --- a/drivers/hid/hid-picolcd.h +++ b/drivers/hid/hid-picolcd.h @@ -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 */