Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b523ff2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e0127662 2763ee64

arch/m68k/coldfire/gpio.c

+1 −7
Original line number Diff line number Diff line
@@ -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);