aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-mx2/mx27ads.c18
-rw-r--r--arch/arm/mach-mx2/pcm038.c9
-rw-r--r--arch/arm/mach-mx2/pcm970-baseboard.c4
-rw-r--r--arch/arm/plat-mxc/include/mach/imx-uart.h2
-rw-r--r--arch/arm/plat-mxc/include/mach/imxfb.h4
-rw-r--r--arch/arm/plat-mxc/include/mach/usb.h2
6 files changed, 14 insertions, 25 deletions
diff --git a/arch/arm/mach-mx2/mx27ads.c b/arch/arm/mach-mx2/mx27ads.c
index f4ad932ba24..ab389c22f4d 100644
--- a/arch/arm/mach-mx2/mx27ads.c
+++ b/arch/arm/mach-mx2/mx27ads.c
@@ -71,11 +71,10 @@ static int uart_mxc_port0_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart0_pins), "UART0");
}
-static int uart_mxc_port0_exit(struct platform_device *pdev)
+static void uart_mxc_port0_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart0_pins,
ARRAY_SIZE(mxc_uart0_pins));
- return 0;
}
static int mxc_uart1_pins[] = {
@@ -91,11 +90,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart1_pins), "UART1");
}
-static int uart_mxc_port1_exit(struct platform_device *pdev)
+static void uart_mxc_port1_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart1_pins,
ARRAY_SIZE(mxc_uart1_pins));
- return 0;
}
static int mxc_uart2_pins[] = {
@@ -111,11 +109,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart2_pins), "UART2");
}
-static int uart_mxc_port2_exit(struct platform_device *pdev)
+static void uart_mxc_port2_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart2_pins,
ARRAY_SIZE(mxc_uart2_pins));
- return 0;
}
static int mxc_uart3_pins[] = {
@@ -131,11 +128,10 @@ static int uart_mxc_port3_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart3_pins), "UART3");
}
-static int uart_mxc_port3_exit(struct platform_device *pdev)
+static void uart_mxc_port3_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart3_pins,
ARRAY_SIZE(mxc_uart3_pins));
- return 0;
}
static int mxc_uart4_pins[] = {
@@ -151,11 +147,10 @@ static int uart_mxc_port4_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart4_pins), "UART4");
}
-static int uart_mxc_port4_exit(struct platform_device *pdev)
+static void uart_mxc_port4_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart4_pins,
ARRAY_SIZE(mxc_uart4_pins));
- return 0;
}
static int mxc_uart5_pins[] = {
@@ -171,11 +166,10 @@ static int uart_mxc_port5_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart5_pins), "UART5");
}
-static int uart_mxc_port5_exit(struct platform_device *pdev)
+static void uart_mxc_port5_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart5_pins,
ARRAY_SIZE(mxc_uart5_pins));
- return 0;
}
static struct platform_device *platform_devices[] __initdata = {
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c
index 732937ca2c9..7f3a62e2cfc 100644
--- a/arch/arm/mach-mx2/pcm038.c
+++ b/arch/arm/mach-mx2/pcm038.c
@@ -101,11 +101,10 @@ static int uart_mxc_port0_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart0_pins), "UART0");
}
-static int uart_mxc_port0_exit(struct platform_device *pdev)
+static void uart_mxc_port0_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart0_pins,
ARRAY_SIZE(mxc_uart0_pins));
- return 0;
}
static int mxc_uart1_pins[] = {
@@ -121,11 +120,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart1_pins), "UART1");
}
-static int uart_mxc_port1_exit(struct platform_device *pdev)
+static void uart_mxc_port1_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart1_pins,
ARRAY_SIZE(mxc_uart1_pins));
- return 0;
}
static int mxc_uart2_pins[] = { PE8_PF_UART3_TXD,
@@ -139,11 +137,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart2_pins), "UART2");
}
-static int uart_mxc_port2_exit(struct platform_device *pdev)
+static void uart_mxc_port2_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart2_pins,
ARRAY_SIZE(mxc_uart2_pins));
- return 0;
}
static struct imxuart_platform_data uart_pdata[] = {
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c
index bf4e520bc1b..16f33443efc 100644
--- a/arch/arm/mach-mx2/pcm970-baseboard.c
+++ b/arch/arm/mach-mx2/pcm970-baseboard.c
@@ -105,11 +105,9 @@ static int pcm038_fb_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_fb_pins), "FB");
}
-static int pcm038_fb_exit(struct platform_device *pdev)
+static void pcm038_fb_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_fb_pins, ARRAY_SIZE(mxc_fb_pins));
-
- return 0;
}
/*
diff --git a/arch/arm/plat-mxc/include/mach/imx-uart.h b/arch/arm/plat-mxc/include/mach/imx-uart.h
index 599217b2e13..90af4d9bc19 100644
--- a/arch/arm/plat-mxc/include/mach/imx-uart.h
+++ b/arch/arm/plat-mxc/include/mach/imx-uart.h
@@ -23,7 +23,7 @@
struct imxuart_platform_data {
int (*init)(struct platform_device *pdev);
- int (*exit)(struct platform_device *pdev);
+ void (*exit)(struct platform_device *pdev);
unsigned int flags;
};
diff --git a/arch/arm/plat-mxc/include/mach/imxfb.h b/arch/arm/plat-mxc/include/mach/imxfb.h
index 762a7b0430e..9f0101157ec 100644
--- a/arch/arm/plat-mxc/include/mach/imxfb.h
+++ b/arch/arm/plat-mxc/include/mach/imxfb.h
@@ -76,8 +76,8 @@ struct imx_fb_platform_data {
u_char * fixed_screen_cpu;
dma_addr_t fixed_screen_dma;
- int (*init)(struct platform_device*);
- int (*exit)(struct platform_device*);
+ int (*init)(struct platform_device *);
+ void (*exit)(struct platform_device *);
void (*lcd_power)(int);
void (*backlight_power)(int);
diff --git a/arch/arm/plat-mxc/include/mach/usb.h b/arch/arm/plat-mxc/include/mach/usb.h
index 2dacb3086f1..be273371f34 100644
--- a/arch/arm/plat-mxc/include/mach/usb.h
+++ b/arch/arm/plat-mxc/include/mach/usb.h
@@ -17,7 +17,7 @@
struct imxusb_platform_data {
int (*init)(struct device *);
- int (*exit)(struct device *);
+ void (*exit)(struct device *);
};
#endif /* __ASM_ARCH_MXC_USB */