diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2009-03-30 09:35:39 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-07 10:15:58 -0400 |
commit | fde364742a1afec9e71e705e863d029295282fe5 (patch) | |
tree | fec36318fd215f44323db458940427c065bb0a22 /arch/arm | |
parent | 1341d34ffc296f98dc84876f35f3151525dc02a2 (diff) |
imx: exit functions can/should be void
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-mx2/mx27ads.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-mx2/pcm038.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-mx2/pcm970-baseboard.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/imx-uart.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/imxfb.h | 4 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/usb.h | 2 |
6 files changed, 14 insertions, 25 deletions
diff --git a/arch/arm/mach-mx2/mx27ads.c b/arch/arm/mach-mx2/mx27ads.c index f4ad932ba24f..ab389c22f4dd 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) | |||
71 | ARRAY_SIZE(mxc_uart0_pins), "UART0"); | 71 | ARRAY_SIZE(mxc_uart0_pins), "UART0"); |
72 | } | 72 | } |
73 | 73 | ||
74 | static int uart_mxc_port0_exit(struct platform_device *pdev) | 74 | static void uart_mxc_port0_exit(struct platform_device *pdev) |
75 | { | 75 | { |
76 | mxc_gpio_release_multiple_pins(mxc_uart0_pins, | 76 | mxc_gpio_release_multiple_pins(mxc_uart0_pins, |
77 | ARRAY_SIZE(mxc_uart0_pins)); | 77 | ARRAY_SIZE(mxc_uart0_pins)); |
78 | return 0; | ||
79 | } | 78 | } |
80 | 79 | ||
81 | static int mxc_uart1_pins[] = { | 80 | static int mxc_uart1_pins[] = { |
@@ -91,11 +90,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev) | |||
91 | ARRAY_SIZE(mxc_uart1_pins), "UART1"); | 90 | ARRAY_SIZE(mxc_uart1_pins), "UART1"); |
92 | } | 91 | } |
93 | 92 | ||
94 | static int uart_mxc_port1_exit(struct platform_device *pdev) | 93 | static void uart_mxc_port1_exit(struct platform_device *pdev) |
95 | { | 94 | { |
96 | mxc_gpio_release_multiple_pins(mxc_uart1_pins, | 95 | mxc_gpio_release_multiple_pins(mxc_uart1_pins, |
97 | ARRAY_SIZE(mxc_uart1_pins)); | 96 | ARRAY_SIZE(mxc_uart1_pins)); |
98 | return 0; | ||
99 | } | 97 | } |
100 | 98 | ||
101 | static int mxc_uart2_pins[] = { | 99 | static int mxc_uart2_pins[] = { |
@@ -111,11 +109,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev) | |||
111 | ARRAY_SIZE(mxc_uart2_pins), "UART2"); | 109 | ARRAY_SIZE(mxc_uart2_pins), "UART2"); |
112 | } | 110 | } |
113 | 111 | ||
114 | static int uart_mxc_port2_exit(struct platform_device *pdev) | 112 | static void uart_mxc_port2_exit(struct platform_device *pdev) |
115 | { | 113 | { |
116 | mxc_gpio_release_multiple_pins(mxc_uart2_pins, | 114 | mxc_gpio_release_multiple_pins(mxc_uart2_pins, |
117 | ARRAY_SIZE(mxc_uart2_pins)); | 115 | ARRAY_SIZE(mxc_uart2_pins)); |
118 | return 0; | ||
119 | } | 116 | } |
120 | 117 | ||
121 | static int mxc_uart3_pins[] = { | 118 | static int mxc_uart3_pins[] = { |
@@ -131,11 +128,10 @@ static int uart_mxc_port3_init(struct platform_device *pdev) | |||
131 | ARRAY_SIZE(mxc_uart3_pins), "UART3"); | 128 | ARRAY_SIZE(mxc_uart3_pins), "UART3"); |
132 | } | 129 | } |
133 | 130 | ||
134 | static int uart_mxc_port3_exit(struct platform_device *pdev) | 131 | static void uart_mxc_port3_exit(struct platform_device *pdev) |
135 | { | 132 | { |
136 | mxc_gpio_release_multiple_pins(mxc_uart3_pins, | 133 | mxc_gpio_release_multiple_pins(mxc_uart3_pins, |
137 | ARRAY_SIZE(mxc_uart3_pins)); | 134 | ARRAY_SIZE(mxc_uart3_pins)); |
138 | return 0; | ||
139 | } | 135 | } |
140 | 136 | ||
141 | static int mxc_uart4_pins[] = { | 137 | static int mxc_uart4_pins[] = { |
@@ -151,11 +147,10 @@ static int uart_mxc_port4_init(struct platform_device *pdev) | |||
151 | ARRAY_SIZE(mxc_uart4_pins), "UART4"); | 147 | ARRAY_SIZE(mxc_uart4_pins), "UART4"); |
152 | } | 148 | } |
153 | 149 | ||
154 | static int uart_mxc_port4_exit(struct platform_device *pdev) | 150 | static void uart_mxc_port4_exit(struct platform_device *pdev) |
155 | { | 151 | { |
156 | mxc_gpio_release_multiple_pins(mxc_uart4_pins, | 152 | mxc_gpio_release_multiple_pins(mxc_uart4_pins, |
157 | ARRAY_SIZE(mxc_uart4_pins)); | 153 | ARRAY_SIZE(mxc_uart4_pins)); |
158 | return 0; | ||
159 | } | 154 | } |
160 | 155 | ||
161 | static int mxc_uart5_pins[] = { | 156 | static int mxc_uart5_pins[] = { |
@@ -171,11 +166,10 @@ static int uart_mxc_port5_init(struct platform_device *pdev) | |||
171 | ARRAY_SIZE(mxc_uart5_pins), "UART5"); | 166 | ARRAY_SIZE(mxc_uart5_pins), "UART5"); |
172 | } | 167 | } |
173 | 168 | ||
174 | static int uart_mxc_port5_exit(struct platform_device *pdev) | 169 | static void uart_mxc_port5_exit(struct platform_device *pdev) |
175 | { | 170 | { |
176 | mxc_gpio_release_multiple_pins(mxc_uart5_pins, | 171 | mxc_gpio_release_multiple_pins(mxc_uart5_pins, |
177 | ARRAY_SIZE(mxc_uart5_pins)); | 172 | ARRAY_SIZE(mxc_uart5_pins)); |
178 | return 0; | ||
179 | } | 173 | } |
180 | 174 | ||
181 | static struct platform_device *platform_devices[] __initdata = { | 175 | static struct platform_device *platform_devices[] __initdata = { |
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c index 732937ca2c9f..7f3a62e2cfcc 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) | |||
101 | ARRAY_SIZE(mxc_uart0_pins), "UART0"); | 101 | ARRAY_SIZE(mxc_uart0_pins), "UART0"); |
102 | } | 102 | } |
103 | 103 | ||
104 | static int uart_mxc_port0_exit(struct platform_device *pdev) | 104 | static void uart_mxc_port0_exit(struct platform_device *pdev) |
105 | { | 105 | { |
106 | mxc_gpio_release_multiple_pins(mxc_uart0_pins, | 106 | mxc_gpio_release_multiple_pins(mxc_uart0_pins, |
107 | ARRAY_SIZE(mxc_uart0_pins)); | 107 | ARRAY_SIZE(mxc_uart0_pins)); |
108 | return 0; | ||
109 | } | 108 | } |
110 | 109 | ||
111 | static int mxc_uart1_pins[] = { | 110 | static int mxc_uart1_pins[] = { |
@@ -121,11 +120,10 @@ static int uart_mxc_port1_init(struct platform_device *pdev) | |||
121 | ARRAY_SIZE(mxc_uart1_pins), "UART1"); | 120 | ARRAY_SIZE(mxc_uart1_pins), "UART1"); |
122 | } | 121 | } |
123 | 122 | ||
124 | static int uart_mxc_port1_exit(struct platform_device *pdev) | 123 | static void uart_mxc_port1_exit(struct platform_device *pdev) |
125 | { | 124 | { |
126 | mxc_gpio_release_multiple_pins(mxc_uart1_pins, | 125 | mxc_gpio_release_multiple_pins(mxc_uart1_pins, |
127 | ARRAY_SIZE(mxc_uart1_pins)); | 126 | ARRAY_SIZE(mxc_uart1_pins)); |
128 | return 0; | ||
129 | } | 127 | } |
130 | 128 | ||
131 | static int mxc_uart2_pins[] = { PE8_PF_UART3_TXD, | 129 | static int mxc_uart2_pins[] = { PE8_PF_UART3_TXD, |
@@ -139,11 +137,10 @@ static int uart_mxc_port2_init(struct platform_device *pdev) | |||
139 | ARRAY_SIZE(mxc_uart2_pins), "UART2"); | 137 | ARRAY_SIZE(mxc_uart2_pins), "UART2"); |
140 | } | 138 | } |
141 | 139 | ||
142 | static int uart_mxc_port2_exit(struct platform_device *pdev) | 140 | static void uart_mxc_port2_exit(struct platform_device *pdev) |
143 | { | 141 | { |
144 | mxc_gpio_release_multiple_pins(mxc_uart2_pins, | 142 | mxc_gpio_release_multiple_pins(mxc_uart2_pins, |
145 | ARRAY_SIZE(mxc_uart2_pins)); | 143 | ARRAY_SIZE(mxc_uart2_pins)); |
146 | return 0; | ||
147 | } | 144 | } |
148 | 145 | ||
149 | static struct imxuart_platform_data uart_pdata[] = { | 146 | 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 bf4e520bc1bc..16f33443efc1 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) | |||
105 | ARRAY_SIZE(mxc_fb_pins), "FB"); | 105 | ARRAY_SIZE(mxc_fb_pins), "FB"); |
106 | } | 106 | } |
107 | 107 | ||
108 | static int pcm038_fb_exit(struct platform_device *pdev) | 108 | static void pcm038_fb_exit(struct platform_device *pdev) |
109 | { | 109 | { |
110 | mxc_gpio_release_multiple_pins(mxc_fb_pins, ARRAY_SIZE(mxc_fb_pins)); | 110 | mxc_gpio_release_multiple_pins(mxc_fb_pins, ARRAY_SIZE(mxc_fb_pins)); |
111 | |||
112 | return 0; | ||
113 | } | 111 | } |
114 | 112 | ||
115 | /* | 113 | /* |
diff --git a/arch/arm/plat-mxc/include/mach/imx-uart.h b/arch/arm/plat-mxc/include/mach/imx-uart.h index 599217b2e13f..90af4d9bc19e 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 @@ | |||
23 | 23 | ||
24 | struct imxuart_platform_data { | 24 | struct imxuart_platform_data { |
25 | int (*init)(struct platform_device *pdev); | 25 | int (*init)(struct platform_device *pdev); |
26 | int (*exit)(struct platform_device *pdev); | 26 | void (*exit)(struct platform_device *pdev); |
27 | unsigned int flags; | 27 | unsigned int flags; |
28 | }; | 28 | }; |
29 | 29 | ||
diff --git a/arch/arm/plat-mxc/include/mach/imxfb.h b/arch/arm/plat-mxc/include/mach/imxfb.h index 762a7b0430e2..9f0101157ec1 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 { | |||
76 | u_char * fixed_screen_cpu; | 76 | u_char * fixed_screen_cpu; |
77 | dma_addr_t fixed_screen_dma; | 77 | dma_addr_t fixed_screen_dma; |
78 | 78 | ||
79 | int (*init)(struct platform_device*); | 79 | int (*init)(struct platform_device *); |
80 | int (*exit)(struct platform_device*); | 80 | void (*exit)(struct platform_device *); |
81 | 81 | ||
82 | void (*lcd_power)(int); | 82 | void (*lcd_power)(int); |
83 | void (*backlight_power)(int); | 83 | 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 2dacb3086f1c..be273371f34a 100644 --- a/arch/arm/plat-mxc/include/mach/usb.h +++ b/arch/arm/plat-mxc/include/mach/usb.h | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | struct imxusb_platform_data { | 18 | struct imxusb_platform_data { |
19 | int (*init)(struct device *); | 19 | int (*init)(struct device *); |
20 | int (*exit)(struct device *); | 20 | void (*exit)(struct device *); |
21 | }; | 21 | }; |
22 | 22 | ||
23 | #endif /* __ASM_ARCH_MXC_USB */ | 23 | #endif /* __ASM_ARCH_MXC_USB */ |