Skip to content

Commit

Permalink
m68k/gpio: remove arch specific sysfs bus device
Browse files Browse the repository at this point in the history
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 3c702e9 ("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 <gerg@uclinux.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
gregungerer committed Apr 11, 2016
1 parent bf16200 commit 2763ee6
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions arch/m68k/coldfire/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down

0 comments on commit 2763ee6

Please sign in to comment.