Skip to content

L
linux-davinci
Commit fde36474 authored by Holger Schurig's avatar Holger Schurig Committed by Sascha Hauer
Browse files
Options

imx: exit functions can/should be void 

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 1341d34f
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 25 deletions
arch/arm/mach-mx2/mx27ads.c
View file @ fde36474
...@@ -71,11 +71,10 @@ static int uart_mxc_port0_init(struct platform_device *pdev) ...@@ -71,11 +71,10 @@ static int uart_mxc_port0_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart0_pins), "UART0"); 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, mxc_gpio_release_multiple_pins(mxc_uart0_pins,
ARRAY_SIZE(mxc_uart0_pins)); ARRAY_SIZE(mxc_uart0_pins));
return 0;
} }
static int mxc_uart1_pins[] = { static int mxc_uart1_pins[] = {
...@@ -91,11 +90,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev) ...@@ -91,11 +90,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart1_pins), "UART1"); 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, mxc_gpio_release_multiple_pins(mxc_uart1_pins,
ARRAY_SIZE(mxc_uart1_pins)); ARRAY_SIZE(mxc_uart1_pins));
return 0;
} }
static int mxc_uart2_pins[] = { static int mxc_uart2_pins[] = {
...@@ -111,11 +109,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev) ...@@ -111,11 +109,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart2_pins), "UART2"); 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, mxc_gpio_release_multiple_pins(mxc_uart2_pins,
ARRAY_SIZE(mxc_uart2_pins)); ARRAY_SIZE(mxc_uart2_pins));
return 0;
} }
static int mxc_uart3_pins[] = { static int mxc_uart3_pins[] = {
...@@ -131,11 +128,10 @@ static int uart_mxc_port3_init(struct platform_device *pdev) ...@@ -131,11 +128,10 @@ static int uart_mxc_port3_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart3_pins), "UART3"); 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, mxc_gpio_release_multiple_pins(mxc_uart3_pins,
ARRAY_SIZE(mxc_uart3_pins)); ARRAY_SIZE(mxc_uart3_pins));
return 0;
} }
static int mxc_uart4_pins[] = { static int mxc_uart4_pins[] = {
...@@ -151,11 +147,10 @@ static int uart_mxc_port4_init(struct platform_device *pdev) ...@@ -151,11 +147,10 @@ static int uart_mxc_port4_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart4_pins), "UART4"); 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, mxc_gpio_release_multiple_pins(mxc_uart4_pins,
ARRAY_SIZE(mxc_uart4_pins)); ARRAY_SIZE(mxc_uart4_pins));
return 0;
} }
static int mxc_uart5_pins[] = { static int mxc_uart5_pins[] = {
...@@ -171,11 +166,10 @@ static int uart_mxc_port5_init(struct platform_device *pdev) ...@@ -171,11 +166,10 @@ static int uart_mxc_port5_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart5_pins), "UART5"); 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, mxc_gpio_release_multiple_pins(mxc_uart5_pins,
ARRAY_SIZE(mxc_uart5_pins)); ARRAY_SIZE(mxc_uart5_pins));
return 0;
} }
static struct platform_device *platform_devices[] __initdata = { static struct platform_device *platform_devices[] __initdata = {
......
arch/arm/mach-mx2/pcm038.c
View file @ fde36474
...@@ -101,11 +101,10 @@ static int uart_mxc_port0_init(struct platform_device *pdev) ...@@ -101,11 +101,10 @@ static int uart_mxc_port0_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart0_pins), "UART0"); 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, mxc_gpio_release_multiple_pins(mxc_uart0_pins,
ARRAY_SIZE(mxc_uart0_pins)); ARRAY_SIZE(mxc_uart0_pins));
return 0;
} }
static int mxc_uart1_pins[] = { static int mxc_uart1_pins[] = {
...@@ -121,11 +120,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev) ...@@ -121,11 +120,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart1_pins), "UART1"); 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, mxc_gpio_release_multiple_pins(mxc_uart1_pins,
ARRAY_SIZE(mxc_uart1_pins)); ARRAY_SIZE(mxc_uart1_pins));
return 0;
} }
static int mxc_uart2_pins[] = { PE8_PF_UART3_TXD, static int mxc_uart2_pins[] = { PE8_PF_UART3_TXD,
...@@ -139,11 +137,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev) ...@@ -139,11 +137,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart2_pins), "UART2"); 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, mxc_gpio_release_multiple_pins(mxc_uart2_pins,
ARRAY_SIZE(mxc_uart2_pins)); ARRAY_SIZE(mxc_uart2_pins));
return 0;
} }
static struct imxuart_platform_data uart_pdata[] = { static struct imxuart_platform_data uart_pdata[] = {
......
arch/arm/mach-mx2/pcm970-baseboard.c
View file @ fde36474
...@@ -105,11 +105,9 @@ static int pcm038_fb_init(struct platform_device *pdev) ...@@ -105,11 +105,9 @@ static int pcm038_fb_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_fb_pins), "FB"); 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)); mxc_gpio_release_multiple_pins(mxc_fb_pins, ARRAY_SIZE(mxc_fb_pins));
return 0;
} }
/* /*
......
arch/arm/plat-mxc/include/mach/imx-uart.h
View file @ fde36474
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
struct imxuart_platform_data { struct imxuart_platform_data {
int (*init)(struct platform_device *pdev); int (*init)(struct platform_device *pdev);
int (*exit)(struct platform_device *pdev); void (*exit)(struct platform_device *pdev);
unsigned int flags; unsigned int flags;
}; };
......
arch/arm/plat-mxc/include/mach/imxfb.h
View file @ fde36474
...@@ -76,8 +76,8 @@ struct imx_fb_platform_data { ...@@ -76,8 +76,8 @@ struct imx_fb_platform_data {
u_char * fixed_screen_cpu; u_char * fixed_screen_cpu;
dma_addr_t fixed_screen_dma; dma_addr_t fixed_screen_dma;
int (*init)(struct platform_device*); int (*init)(struct platform_device *);
int (*exit)(struct platform_device*); void (*exit)(struct platform_device *);
void (*lcd_power)(int); void (*lcd_power)(int);
void (*backlight_power)(int); void (*backlight_power)(int);
......
arch/arm/plat-mxc/include/mach/usb.h
View file @ fde36474
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
struct imxusb_platform_data { struct imxusb_platform_data {
int (*init)(struct device *); int (*init)(struct device *);
int (*exit)(struct device *); void (*exit)(struct device *);
}; };
#endif /* __ASM_ARCH_MXC_USB */ #endif /* __ASM_ARCH_MXC_USB */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment