From patchwork Tue Apr 9 01:46:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 234929 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ADC552C00AE for ; Tue, 9 Apr 2013 11:47:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936710Ab3DIBr5 (ORCPT ); Mon, 8 Apr 2013 21:47:57 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:13928 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936057Ab3DIBr4 (ORCPT ); Mon, 8 Apr 2013 21:47:56 -0400 Received: from 172.24.2.119 (EHLO szxeml212-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BAH31263; Tue, 09 Apr 2013 09:47:54 +0800 (CST) Received: from SZXEML460-HUB.china.huawei.com (10.82.67.203) by szxeml212-edg.china.huawei.com (172.24.2.181) with Microsoft SMTP Server (TLS) id 14.1.323.7; Tue, 9 Apr 2013 09:47:10 +0800 Received: from localhost (10.135.76.69) by szxeml460-hub.china.huawei.com (10.82.67.203) with Microsoft SMTP Server id 14.1.323.7; Tue, 9 Apr 2013 09:47:01 +0800 From: Yijing Wang To: Wolfram Sang CC: , , Hanjun Guo , , Yijing Wang , Greg Kroah-Hartman , Bill Pemberton Subject: [PATCH] i2c: remove CONFIG_HOTPLUG ifdefs Date: Tue, 9 Apr 2013 09:46:39 +0800 Message-ID: <1365471999-2396-1-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.135.76.69] X-CFilter-Loop: Reflected Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org CONFIG_HOTPLUG is going away as an option, cleanup CONFIG_HOTPLUG ifdefs in i2c files. Signed-off-by: Yijing Wang Cc: Greg Kroah-Hartman Cc: Bill Pemberton Acked-by: Greg Kroah-Hartman --- drivers/i2c/i2c-core.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 991d38d..d1db97e 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -91,7 +91,6 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv) return 0; } -#ifdef CONFIG_HOTPLUG /* uevent helps with hotplug: modprobe -q $(MODALIAS) */ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) @@ -105,10 +104,6 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } -#else -#define i2c_device_uevent NULL -#endif /* CONFIG_HOTPLUG */ - static int i2c_device_probe(struct device *dev) { struct i2c_client *client = i2c_verify_client(dev);