Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759948AbcDFCcZ (ORCPT ); Tue, 5 Apr 2016 22:32:25 -0400 Received: from icp-osb-irony-out9.external.iinet.net.au ([203.59.1.226]:58750 "EHLO icp-osb-irony-out9.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752745AbcDFCcX (ORCPT ); Tue, 5 Apr 2016 22:32:23 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C2BgB+dARX/zXSMGdcHAGDGoFQpy0BBpF5hA8ShXuBSEwBAQEBAQFmBSKFQSgFAx9bFRKIJsBuhViPKAWNTYo0jg2JToU8Ao8cYoE2AQEIRBmBXCowiDcBAQE X-IPAS-Result: A2C2BgB+dARX/zXSMGdcHAGDGoFQpy0BBpF5hA8ShXuBSEwBAQEBAQFmBSKFQSgFAx9bFRKIJsBuhViPKAWNTYo0jg2JToU8Ao8cYoE2AQEIRBmBXCowiDcBAQE X-IronPort-AV: E=Sophos;i="5.24,446,1454947200"; d="scan'208";a="35890407" From: Greg Ungerer To: linux-m68k@vger.kernel.org, linux@roeck-us.net, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, gnurou@gmail.com, linus.walleij@linaro.org Cc: Greg Ungerer Subject: [PATCH] m68k/gpio: remove arch specific sysfs bus device Date: Wed, 6 Apr 2016 12:32:10 +1000 Message-Id: <1459909950-26077-1-git-send-email-gerg@uclinux.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1456 Lines: 46 From: Greg Ungerer The ColdFire architecture specific gpio support code registers a sysfs bus device named "gpio". This clashes with the new generic API device added in commit 3c702e99 ("gpio: add a userspace chardev ABI for GPIOs"). The old ColdFire sysfs gpio device was never used for anything specific, and no links or other nodes were created under it. The new API sysfs gpio device has all the same default sysfs links (device, drivers, etc) and they are properly populated. Remove the old ColdFire sysfs gpio registration. Signed-off-by: Greg Ungerer --- arch/m68k/coldfire/gpio.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/m68k/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c index 8832083..b515809 100644 --- a/arch/m68k/coldfire/gpio.c +++ b/arch/m68k/coldfire/gpio.c @@ -158,11 +158,6 @@ static int mcfgpio_to_irq(struct gpio_chip *chip, unsigned offset) return -EINVAL; } -static struct bus_type mcfgpio_subsys = { - .name = "gpio", - .dev_name = "gpio", -}; - static struct gpio_chip mcfgpio_chip = { .label = "mcfgpio", .request = mcfgpio_request, @@ -178,8 +173,7 @@ static struct gpio_chip mcfgpio_chip = { static int __init mcfgpio_sysinit(void) { - gpiochip_add_data(&mcfgpio_chip, NULL); - return subsys_system_register(&mcfgpio_subsys, NULL); + return gpiochip_add_data(&mcfgpio_chip, NULL); } core_initcall(mcfgpio_sysinit); -- 1.9.1