Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30772
b: refs/heads/master
c: 55b8c04
h: refs/heads/master
v: v3
  • Loading branch information
Jim Cromie authored and Linus Torvalds committed Jun 28, 2006
1 parent 8e1a933 commit 95da032
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 979b5ec3a7055d35b212f657e80257ec1346aa0e
refs/heads/master: 55b8c0455b8aeb80f94183fa3aa42e3fa62b1705
2 changes: 1 addition & 1 deletion trunk/arch/i386/kernel/scx200.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_
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;
unsigned long flags;
Expand Down
14 changes: 7 additions & 7 deletions trunk/include/linux/scx200_gpio.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#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 long scx200_gpio_shadow[2];
Expand All @@ -17,7 +17,7 @@ extern long scx200_gpio_shadow[2];

/* 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_IOADDR + 0x04;
__SCx200_GPIO_INDEX;
Expand All @@ -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
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_INDEX;

Expand All @@ -38,7 +38,7 @@ static inline int scx200_gpio_current(int index) {

/* 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_IOADDR;
__SCx200_GPIO_SHADOW;
Expand All @@ -49,7 +49,7 @@ static inline void scx200_gpio_set_high(int index) {

/* 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_IOADDR;
__SCx200_GPIO_SHADOW;
Expand All @@ -60,7 +60,7 @@ static inline void scx200_gpio_set_low(int index) {

/* 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_IOADDR;
__SCx200_GPIO_SHADOW;
Expand All @@ -73,7 +73,7 @@ static inline void scx200_gpio_set(int index, int state) {
}

/* 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_IOADDR;
__SCx200_GPIO_SHADOW;
Expand Down

0 comments on commit 95da032

Please sign in to comment.