From: Greg Ungerer <gerg@gumby.(none)>
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 <[email protected]>
---
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
On Wed, Apr 6, 2016 at 4:32 AM, Greg Ungerer <[email protected]> wrote:
> From: Greg Ungerer <gerg@gumby.(none)>
>
> 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 <[email protected]>
Acked-by: Linus Walleij <[email protected]>
Yours,
Linus Walleij
On 06/04/16 16:57, Linus Walleij wrote:
> On Wed, Apr 6, 2016 at 4:32 AM, Greg Ungerer <[email protected]> wrote:
>
>> From: Greg Ungerer <gerg@gumby.(none)>
>>
>> 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 <[email protected]>
>
> Acked-by: Linus Walleij <[email protected]>
Thanks Linus. I will push via the m68knommu git tree.
Regards
Greg