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

Commit 55b8c045 authored by Jim Cromie's avatar Jim Cromie Committed by Linus Torvalds
Browse files

[PATCH] chardev: GPIO for SCx200 & PC-8736x: device minor numbers are unsigned ints 



Per kernel headers, device minor numbers are unsigned ints.  Do the same in
this driver.

Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 979b5ec3

arch/i386/kernel/scx200.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_ 
	return 0;

	return 0;

}

}





u32 scx200_gpio_configure(int index, u32 mask, u32 bits)

u32 scx200_gpio_configure(unsigned index, u32 mask, u32 bits)

{

{

	u32 config, new_config;

	u32 config, new_config;

	unsigned long flags;

	unsigned long flags;

include/linux/scx200_gpio.h

+7 −7
Original line number Original line Diff line number Diff line 
#include <linux/spinlock.h>

#include <linux/spinlock.h>





u32 scx200_gpio_configure(int index, u32 set, u32 clear);

u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear);





extern unsigned scx200_gpio_base;

extern unsigned scx200_gpio_base;

extern long scx200_gpio_shadow[2];

extern long scx200_gpio_shadow[2];
@@ -17,7 +17,7 @@ extern long scx200_gpio_shadow[2]; 




/* returns the value of the GPIO pin */

/* returns the value of the GPIO pin */





static inline int scx200_gpio_get(int index) {

static inline int scx200_gpio_get(unsigned index) {

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_IOADDR + 0x04;

	__SCx200_GPIO_IOADDR + 0x04;

	__SCx200_GPIO_INDEX;

	__SCx200_GPIO_INDEX;
@@ -29,7 +29,7 @@ static inline int scx200_gpio_get(int index) { 
   driven if the GPIO is configured as an output, it might not be the

   driven if the GPIO is configured as an output, it might not be the

   state of the GPIO right now if the GPIO is configured as an input) */

   state of the GPIO right now if the GPIO is configured as an input) */





static inline int scx200_gpio_current(int index) {

static inline int scx200_gpio_current(unsigned index) {

        __SCx200_GPIO_BANK;

        __SCx200_GPIO_BANK;

	__SCx200_GPIO_INDEX;

	__SCx200_GPIO_INDEX;
@@ -38,7 +38,7 @@ static inline int scx200_gpio_current(int index) { 




/* drive the GPIO signal high */

/* drive the GPIO signal high */





static inline void scx200_gpio_set_high(int index) {

static inline void scx200_gpio_set_high(unsigned index) {

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_SHADOW;

	__SCx200_GPIO_SHADOW;
@@ -49,7 +49,7 @@ static inline void scx200_gpio_set_high(int index) { 




/* drive the GPIO signal low */

/* drive the GPIO signal low */





static inline void scx200_gpio_set_low(int index) {

static inline void scx200_gpio_set_low(unsigned index) {

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_SHADOW;

	__SCx200_GPIO_SHADOW;
@@ -60,7 +60,7 @@ static inline void scx200_gpio_set_low(int index) { 




/* drive the GPIO signal to state */

/* drive the GPIO signal to state */





static inline void scx200_gpio_set(int index, int state) {

static inline void scx200_gpio_set(unsigned index, int state) {

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_SHADOW;

	__SCx200_GPIO_SHADOW;
@@ -73,7 +73,7 @@ static inline void scx200_gpio_set(int index, int state) { 
}

}





/* toggle the GPIO signal */

/* toggle the GPIO signal */

static inline void scx200_gpio_change(int index) {

static inline void scx200_gpio_change(unsigned index) {

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_BANK;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_IOADDR;

	__SCx200_GPIO_SHADOW;

	__SCx200_GPIO_SHADOW;