diff options
Diffstat (limited to 'include/linux/scx200_gpio.h')
-rw-r--r-- | include/linux/scx200_gpio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/scx200_gpio.h b/include/linux/scx200_gpio.h index d2b058130eb1..ece4e553e9ac 100644 --- a/include/linux/scx200_gpio.h +++ b/include/linux/scx200_gpio.h | |||
@@ -1,7 +1,7 @@ | |||
1 | u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear); | 1 | u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear); |
2 | 2 | ||
3 | extern unsigned scx200_gpio_base; | 3 | extern unsigned scx200_gpio_base; |
4 | extern long scx200_gpio_shadow[2]; | 4 | extern unsigned long scx200_gpio_shadow[2]; |
5 | extern struct nsc_gpio_ops scx200_gpio_ops; | 5 | extern struct nsc_gpio_ops scx200_gpio_ops; |
6 | 6 | ||
7 | #define scx200_gpio_present() (scx200_gpio_base!=0) | 7 | #define scx200_gpio_present() (scx200_gpio_base!=0) |
@@ -9,7 +9,7 @@ extern struct nsc_gpio_ops scx200_gpio_ops; | |||
9 | /* Definitions to make sure I do the same thing in all functions */ | 9 | /* Definitions to make sure I do the same thing in all functions */ |
10 | #define __SCx200_GPIO_BANK unsigned bank = index>>5 | 10 | #define __SCx200_GPIO_BANK unsigned bank = index>>5 |
11 | #define __SCx200_GPIO_IOADDR unsigned short ioaddr = scx200_gpio_base+0x10*bank | 11 | #define __SCx200_GPIO_IOADDR unsigned short ioaddr = scx200_gpio_base+0x10*bank |
12 | #define __SCx200_GPIO_SHADOW long *shadow = scx200_gpio_shadow+bank | 12 | #define __SCx200_GPIO_SHADOW unsigned long *shadow = scx200_gpio_shadow+bank |
13 | #define __SCx200_GPIO_INDEX index &= 31 | 13 | #define __SCx200_GPIO_INDEX index &= 31 |
14 | 14 | ||
15 | #define __SCx200_GPIO_OUT __asm__ __volatile__("outsl":"=mS" (shadow):"d" (ioaddr), "0" (shadow)) | 15 | #define __SCx200_GPIO_OUT __asm__ __volatile__("outsl":"=mS" (shadow):"d" (ioaddr), "0" (shadow)) |
@@ -42,7 +42,7 @@ static inline void scx200_gpio_set_high(unsigned index) { | |||
42 | __SCx200_GPIO_IOADDR; | 42 | __SCx200_GPIO_IOADDR; |
43 | __SCx200_GPIO_SHADOW; | 43 | __SCx200_GPIO_SHADOW; |
44 | __SCx200_GPIO_INDEX; | 44 | __SCx200_GPIO_INDEX; |
45 | set_bit(index, shadow); | 45 | set_bit(index, shadow); /* __set_bit()? */ |
46 | __SCx200_GPIO_OUT; | 46 | __SCx200_GPIO_OUT; |
47 | } | 47 | } |
48 | 48 | ||
@@ -53,7 +53,7 @@ static inline void scx200_gpio_set_low(unsigned index) { | |||
53 | __SCx200_GPIO_IOADDR; | 53 | __SCx200_GPIO_IOADDR; |
54 | __SCx200_GPIO_SHADOW; | 54 | __SCx200_GPIO_SHADOW; |
55 | __SCx200_GPIO_INDEX; | 55 | __SCx200_GPIO_INDEX; |
56 | clear_bit(index, shadow); | 56 | clear_bit(index, shadow); /* __clear_bit()? */ |
57 | __SCx200_GPIO_OUT; | 57 | __SCx200_GPIO_OUT; |
58 | } | 58 | } |
59 | 59 | ||