diff options
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/gpio.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/npe.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx_npe.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index cfd52fb341cb..3bbf40f6d964 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -117,7 +117,7 @@ int gpio_to_irq(int gpio) | |||
117 | } | 117 | } |
118 | EXPORT_SYMBOL(gpio_to_irq); | 118 | EXPORT_SYMBOL(gpio_to_irq); |
119 | 119 | ||
120 | int irq_to_gpio(int irq) | 120 | int irq_to_gpio(unsigned int irq) |
121 | { | 121 | { |
122 | int gpio = (irq < 32) ? irq2gpio[irq] : -EINVAL; | 122 | int gpio = (irq < 32) ? irq2gpio[irq] : -EINVAL; |
123 | 123 | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/gpio.h b/arch/arm/mach-ixp4xx/include/mach/gpio.h index cd5aec26c072..a5f87ded2f28 100644 --- a/arch/arm/mach-ixp4xx/include/mach/gpio.h +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h | |||
@@ -70,7 +70,7 @@ static inline void gpio_set_value(unsigned gpio, int value) | |||
70 | #include <asm-generic/gpio.h> /* cansleep wrappers */ | 70 | #include <asm-generic/gpio.h> /* cansleep wrappers */ |
71 | 71 | ||
72 | extern int gpio_to_irq(int gpio); | 72 | extern int gpio_to_irq(int gpio); |
73 | extern int irq_to_gpio(int gpio); | 73 | extern int irq_to_gpio(unsigned int irq); |
74 | 74 | ||
75 | #endif | 75 | #endif |
76 | 76 | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/npe.h b/arch/arm/mach-ixp4xx/include/mach/npe.h index 37d0511689dc..e320db2457ae 100644 --- a/arch/arm/mach-ixp4xx/include/mach/npe.h +++ b/arch/arm/mach-ixp4xx/include/mach/npe.h | |||
@@ -33,7 +33,7 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what); | |||
33 | int npe_recv_message(struct npe *npe, void *msg, const char *what); | 33 | int npe_recv_message(struct npe *npe, void *msg, const char *what); |
34 | int npe_send_recv_message(struct npe *npe, void *msg, const char *what); | 34 | int npe_send_recv_message(struct npe *npe, void *msg, const char *what); |
35 | int npe_load_firmware(struct npe *npe, const char *name, struct device *dev); | 35 | int npe_load_firmware(struct npe *npe, const char *name, struct device *dev); |
36 | struct npe *npe_request(int id); | 36 | struct npe *npe_request(unsigned id); |
37 | void npe_release(struct npe *npe); | 37 | void npe_release(struct npe *npe); |
38 | 38 | ||
39 | #endif /* __IXP4XX_NPE_H */ | 39 | #endif /* __IXP4XX_NPE_H */ |
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c index 47ac69c7ec78..e8bb25778166 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c | |||
@@ -665,7 +665,7 @@ err: | |||
665 | } | 665 | } |
666 | 666 | ||
667 | 667 | ||
668 | struct npe *npe_request(int id) | 668 | struct npe *npe_request(unsigned id) |
669 | { | 669 | { |
670 | if (id < NPE_COUNT) | 670 | if (id < NPE_COUNT) |
671 | if (npe_tab[id].valid) | 671 | if (npe_tab[id].valid) |