x86: remove 2.6.35 patches
SVN-Revision: 26710
This commit is contained in:
		| @@ -1,11 +0,0 @@ | ||||
| --- a/drivers/leds/leds-net5501.c | ||||
| +++ b/drivers/leds/leds-net5501.c | ||||
| @@ -92,3 +92,8 @@ unmap: | ||||
|  } | ||||
|   | ||||
|  arch_initcall(soekris_init); | ||||
| + | ||||
| +MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); | ||||
| +MODULE_DESCRIPTION("Soekris Net5501 LED support"); | ||||
| +MODULE_LICENSE("GPL"); | ||||
| + | ||||
| @@ -1,10 +0,0 @@ | ||||
| --- a/arch/x86/boot/tools/build.c | ||||
| +++ b/arch/x86/boot/tools/build.c | ||||
| @@ -29,7 +29,6 @@ | ||||
|  #include <stdarg.h> | ||||
|  #include <sys/types.h> | ||||
|  #include <sys/stat.h> | ||||
| -#include <sys/sysmacros.h> | ||||
|  #include <unistd.h> | ||||
|  #include <fcntl.h> | ||||
|  #include <sys/mman.h> | ||||
| @@ -1,102 +0,0 @@ | ||||
| --- a/drivers/char/cs5535_gpio.c | ||||
| +++ b/drivers/char/cs5535_gpio.c | ||||
| @@ -15,6 +15,7 @@ | ||||
|  #include <linux/kernel.h> | ||||
|  #include <linux/init.h> | ||||
|  #include <linux/cdev.h> | ||||
| +#include <linux/device.h> | ||||
|  #include <linux/ioport.h> | ||||
|  #include <linux/pci.h> | ||||
|   | ||||
| @@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] | ||||
|  MODULE_DEVICE_TABLE(pci, divil_pci); | ||||
|   | ||||
|  static struct cdev cs5535_gpio_cdev; | ||||
| +static struct class *cs5535_gpio_class; | ||||
|   | ||||
|  /* reserve 32 entries even though some aren't usable */ | ||||
|  #define CS5535_GPIO_COUNT	32 | ||||
| @@ -66,9 +68,14 @@ static struct gpio_regmap rm[] = | ||||
|  	{ 0x30, 0x00, '1', '0' },	/* GPIOx_READ_BACK / GPIOx_OUT_VAL */ | ||||
|  	{ 0x20, 0x20, 'I', 'i' },	/* GPIOx_IN_EN */ | ||||
|  	{ 0x04, 0x04, 'O', 'o' },	/* GPIOx_OUT_EN */ | ||||
| +	{ 0x10, 0x10, 'A', 'a' },	/* GPIOx_OUT_AUX1_SEL */ | ||||
| +	{ 0x14, 0x14, 'B', 'b' },	/* GPIOx_OUT_AUX2_SEL */ | ||||
|  	{ 0x08, 0x08, 't', 'T' },	/* GPIOx_OUT_OD_EN */ | ||||
|  	{ 0x18, 0x18, 'P', 'p' },	/* GPIOx_OUT_PU_EN */ | ||||
|  	{ 0x1c, 0x1c, 'D', 'd' },	/* GPIOx_OUT_PD_EN */ | ||||
| +	{ 0x24, 0x24, 'N', 'n' },	/* GPIOx_IN_INV_EN */ | ||||
| +	{ 0x0c, 0x0c, 'X', 'x' },	/* GPIOx_OUT_INV_EN */ | ||||
| +	{ 0x00, 0x00, 'H', 'L' },	/* GPIOx_OUT_VAL */ | ||||
|  }; | ||||
|   | ||||
|   | ||||
| @@ -176,7 +183,7 @@ static int __init cs5535_gpio_init(void) | ||||
|  { | ||||
|  	dev_t	dev_id; | ||||
|  	u32	low, hi; | ||||
| -	int	retval; | ||||
| +	int	retval, i; | ||||
|   | ||||
|  	if (pci_dev_present(divil_pci) == 0) { | ||||
|  		printk(KERN_WARNING NAME ": DIVIL not found\n"); | ||||
| @@ -231,23 +238,54 @@ static int __init cs5535_gpio_init(void) | ||||
|  		major = MAJOR(dev_id); | ||||
|  	} | ||||
|   | ||||
| -	if (retval) { | ||||
| -		release_region(gpio_base, CS5535_GPIO_SIZE); | ||||
| -		return -1; | ||||
| -	} | ||||
| +	if (retval) | ||||
| +		goto error; | ||||
|   | ||||
|  	printk(KERN_DEBUG NAME ": base=%#x mask=%#lx major=%d\n", | ||||
|  	       gpio_base, mask, major); | ||||
|   | ||||
|  	cdev_init(&cs5535_gpio_cdev, &cs5535_gpio_fops); | ||||
| -	cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT); | ||||
| +	retval = cdev_add(&cs5535_gpio_cdev, dev_id, CS5535_GPIO_COUNT); | ||||
| +	if (retval) { | ||||
| +		kobject_put(&cs5535_gpio_cdev.kobj); | ||||
| +		goto error_region; | ||||
| +	} | ||||
| + | ||||
| +	cs5535_gpio_class = class_create(THIS_MODULE, "cs5535_gpio"); | ||||
| +	if (IS_ERR(cs5535_gpio_class)) { | ||||
| +		printk(KERN_ERR "Error creating cs5535_gpio class\n"); | ||||
| +		cdev_del(&cs5535_gpio_cdev); | ||||
| +		retval = PTR_ERR(cs5535_gpio_class); | ||||
| +		goto error_region; | ||||
| +	} | ||||
| + | ||||
| +	for (i = 0; i < CS5535_GPIO_COUNT; i++) { | ||||
| +		if (mask & (1<<i)) { | ||||
| +			device_create(cs5535_gpio_class, NULL, MKDEV(major, i), NULL, "cs5535_gpio%d", i); | ||||
| +		} | ||||
| +	} | ||||
|   | ||||
|  	return 0; | ||||
| + | ||||
| +error_region: | ||||
| +	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT); | ||||
| +error: | ||||
| +	release_region(gpio_base, CS5535_GPIO_SIZE); | ||||
| +	return retval; | ||||
|  } | ||||
|   | ||||
|  static void __exit cs5535_gpio_cleanup(void) | ||||
|  { | ||||
|  	dev_t dev_id = MKDEV(major, 0); | ||||
| +	int i; | ||||
| + | ||||
| +	for (i = 0; i < CS5535_GPIO_COUNT; i++) { | ||||
| +		if (mask & (1<<i)) { | ||||
| +			device_destroy(cs5535_gpio_class, MKDEV(major, i)); | ||||
| +		} | ||||
| +	} | ||||
| + | ||||
| +	class_destroy(cs5535_gpio_class); | ||||
|   | ||||
|  	cdev_del(&cs5535_gpio_cdev); | ||||
|  	unregister_chrdev_region(dev_id, CS5535_GPIO_COUNT); | ||||
		Reference in New Issue
	
	Block a user
	 Felix Fietkau
					Felix Fietkau