From patchwork Mon Nov 19 18:19:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Pemberton X-Patchwork-Id: 1767181 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 4E7A8DFF71 for ; Mon, 19 Nov 2012 18:38:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754567Ab2KSSio (ORCPT ); Mon, 19 Nov 2012 13:38:44 -0500 Received: from viridian.itc.Virginia.EDU ([128.143.12.139]:41682 "EHLO viridian.itc.virginia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754051Ab2KSSiQ (ORCPT ); Mon, 19 Nov 2012 13:38:16 -0500 Received: by viridian.itc.virginia.edu (Postfix, from userid 1249) id 2295A801E7; Mon, 19 Nov 2012 13:27:23 -0500 (EST) From: Bill Pemberton To: gregkh@linuxfoundation.org Cc: Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 003/493] Input: serio - remove CONFIG_HOTPLUG ifdefs Date: Mon, 19 Nov 2012 13:19:12 -0500 Message-Id: <1353349642-3677-3-git-send-email-wfp5p@virginia.edu> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353349642-3677-1-git-send-email-wfp5p@virginia.edu> References: <1353349642-3677-1-git-send-email-wfp5p@virginia.edu> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. Signed-off-by: Bill Pemberton Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org --- drivers/input/serio/serio.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index d0f7533..25fc597 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -891,8 +891,6 @@ static int serio_bus_match(struct device *dev, struct device_driver *drv) return serio_match_port(serio_drv->id_table, serio); } -#ifdef CONFIG_HOTPLUG - #define SERIO_ADD_UEVENT_VAR(fmt, val...) \ do { \ int err = add_uevent_var(env, fmt, val); \ @@ -920,15 +918,6 @@ static int serio_uevent(struct device *dev, struct kobj_uevent_env *env) } #undef SERIO_ADD_UEVENT_VAR -#else - -static int serio_uevent(struct device *dev, struct kobj_uevent_env *env) -{ - return -ENODEV; -} - -#endif /* CONFIG_HOTPLUG */ - #ifdef CONFIG_PM static int serio_suspend(struct device *dev) {