From patchwork Fri Sep 16 06:49:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 76353 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp338146qgf; Thu, 15 Sep 2016 23:49:26 -0700 (PDT) X-Received: by 10.98.77.70 with SMTP id a67mr20285499pfb.151.1474008566548; Thu, 15 Sep 2016 23:49:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u5si8703404pau.218.2016.09.15.23.49.26; Thu, 15 Sep 2016 23:49:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754515AbcIPGtW (ORCPT + 27 others); Fri, 16 Sep 2016 02:49:22 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:44224 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbcIPGtP (ORCPT ); Fri, 16 Sep 2016 02:49:15 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id u8G6nBZw004898; Fri, 16 Sep 2016 01:49:11 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u8G6n9nX024347; Fri, 16 Sep 2016 01:49:09 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Fri, 16 Sep 2016 01:49:09 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u8G6n7PV029372; Fri, 16 Sep 2016 01:49:08 -0500 From: Kishon Vijay Abraham I To: CC: , , Subject: [PATCH] include: extcon: Fix compilation error caused because of incomplete merge Date: Fri, 16 Sep 2016 12:19:07 +0530 Message-ID: <1474008547-20112-1-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the following compilation error caused due to incomplete merge. This is observed if CONFIG_EXTCON is not set. In file included from ./include/linux/mfd/palmas.h:23:0, from drivers/input/misc/palmas-pwrbutton.c:22: ./include/linux/extcon.h: In function ‘extcon_sync’: ./include/linux/extcon.h:361:1: error: expected declaration specifiers before ‘<<’ token ./include/linux/extcon.h:370:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token ./include/linux/extcon.h:376:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘>>’ token ./include/linux/extcon.h:381:1: error: expected declaration specifiers before ‘<<’ token ./include/linux/extcon.h:390:1: error: expected declaration specifiers or ‘...’ before ‘==’ token ./include/linux/extcon.h:476:11: warning: ‘struct extcon_specific_cable_nb’ declared inside parameter list [enabled by default] ./include/linux/extcon.h:476:11: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] ./include/linux/extcon.h:474:19: error: storage class specified for parameter ‘extcon_register_interest’ ./include/linux/extcon.h:474:19: warning: parameter ‘extcon_register_interest’ declared ‘inline’ [enabled by default] ./include/linux/extcon.h:477:1: warning: ‘always_inline’ attribute ignored [-Wattributes] ./include/linux/extcon.h:474:19: error: ‘no_instrument_function’ attribute applies only to functions ./include/linux/extcon.h:477:1: error: expected ‘;’, ‘,’ or ‘)’ before ‘{’ token Signed-off-by: Kishon Vijay Abraham I --- include/linux/extcon.h | 29 ----------------------------- 1 file changed, 29 deletions(-) -- 1.7.9.5 diff --git a/include/linux/extcon.h b/include/linux/extcon.h index 2b9f151..b871c0c 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -358,8 +358,6 @@ static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id } static inline int extcon_sync(struct extcon_dev *edev, unsigned int id) -<<<<<<< HEAD -======= { return 0; } @@ -373,50 +371,23 @@ static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id, unsigned int prop, union extcon_property_value prop_val) ->>>>>>> next { return 0; } -<<<<<<< HEAD -static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, - unsigned int prop, - union extcon_property_value *prop_val) -{ - return 0; -} -static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id, - unsigned int prop, -======= static inline int extcon_set_property_sync(struct extcon_dev *edev, unsigned int id, unsigned int prop, ->>>>>>> next union extcon_property_value prop_val) { return 0; } -<<<<<<< HEAD -static inline int extcon_set_property_sync(struct extcon_dev *edev, - unsigned int id, unsigned int prop, - union extcon_property_value prop_val) -======= -static inline int extcon_get_property_capability(struct extcon_dev *edev, - unsigned int id, unsigned int prop) ->>>>>>> next -{ - return 0; -} - -<<<<<<< HEAD static inline int extcon_get_property_capability(struct extcon_dev *edev, unsigned int id, unsigned int prop) { return 0; } -======= ->>>>>>> next static inline int extcon_set_property_capability(struct extcon_dev *edev, unsigned int id, unsigned int prop) {