diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-13 18:58:32 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-13 18:58:32 +0300 |
| commit | 5b523ff281b9f97ec75d526e2750381c6e8c9326 (patch) | |
| tree | d473bf600d0cb70d7dfd0295533850506ddab0f4 /arch/m68k | |
| parent | e012766258ad7a90a3474ac24905b7df336e698f (diff) | |
| parent | 2763ee644809820fb1b741f1e7dd779038092324 (diff) | |
| download | linux-5b523ff281b9f97ec75d526e2750381c6e8c9326.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu/coldfire fix from Greg Ungerer:
"Only a single change that removes a local arch specific gpio bus sysfs
device that now clashes with the generic gpio bus sysfs device
interface"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k/gpio: remove arch specific sysfs bus device
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/coldfire/gpio.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/m68k/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c index 8832083e1cb8..b515809be2b9 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); |