diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 18:22:52 -0500 |
commit | 9671f09921d93e722a28ae9610d478e092ac5466 (patch) | |
tree | 3d2c5c8014d703b89061fd02e5362bf81a48a1f9 /drivers/tty/serial/sh-sci.c | |
parent | 2d47b7160243b1422006b91debf438484a4fde58 (diff) |
tty: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Lucas Tavares <lucaskt@linux.vnet.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Tony Prisk <linux@prisktech.co.nz>
Acked-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
-rw-r--r-- | drivers/tty/serial/sh-sci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index d38c0f546032..61477567423f 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c | |||
@@ -1126,7 +1126,7 @@ static const char *sci_gpio_str(unsigned int index) | |||
1126 | return sci_gpio_names[index]; | 1126 | return sci_gpio_names[index]; |
1127 | } | 1127 | } |
1128 | 1128 | ||
1129 | static void __devinit sci_init_gpios(struct sci_port *port) | 1129 | static void sci_init_gpios(struct sci_port *port) |
1130 | { | 1130 | { |
1131 | struct uart_port *up = &port->port; | 1131 | struct uart_port *up = &port->port; |
1132 | int i; | 1132 | int i; |
@@ -2069,7 +2069,7 @@ static struct uart_ops sci_uart_ops = { | |||
2069 | #endif | 2069 | #endif |
2070 | }; | 2070 | }; |
2071 | 2071 | ||
2072 | static int __devinit sci_init_single(struct platform_device *dev, | 2072 | static int sci_init_single(struct platform_device *dev, |
2073 | struct sci_port *sci_port, | 2073 | struct sci_port *sci_port, |
2074 | unsigned int index, | 2074 | unsigned int index, |
2075 | struct plat_sci_port *p) | 2075 | struct plat_sci_port *p) |
@@ -2240,7 +2240,7 @@ static void serial_console_write(struct console *co, const char *s, | |||
2240 | local_irq_restore(flags); | 2240 | local_irq_restore(flags); |
2241 | } | 2241 | } |
2242 | 2242 | ||
2243 | static int __devinit serial_console_setup(struct console *co, char *options) | 2243 | static int serial_console_setup(struct console *co, char *options) |
2244 | { | 2244 | { |
2245 | struct sci_port *sci_port; | 2245 | struct sci_port *sci_port; |
2246 | struct uart_port *port; | 2246 | struct uart_port *port; |
@@ -2294,7 +2294,7 @@ static struct console early_serial_console = { | |||
2294 | 2294 | ||
2295 | static char early_serial_buf[32]; | 2295 | static char early_serial_buf[32]; |
2296 | 2296 | ||
2297 | static int __devinit sci_probe_earlyprintk(struct platform_device *pdev) | 2297 | static int sci_probe_earlyprintk(struct platform_device *pdev) |
2298 | { | 2298 | { |
2299 | struct plat_sci_port *cfg = pdev->dev.platform_data; | 2299 | struct plat_sci_port *cfg = pdev->dev.platform_data; |
2300 | 2300 | ||
@@ -2317,7 +2317,7 @@ static int __devinit sci_probe_earlyprintk(struct platform_device *pdev) | |||
2317 | #define SCI_CONSOLE (&serial_console) | 2317 | #define SCI_CONSOLE (&serial_console) |
2318 | 2318 | ||
2319 | #else | 2319 | #else |
2320 | static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev) | 2320 | static inline int sci_probe_earlyprintk(struct platform_device *pdev) |
2321 | { | 2321 | { |
2322 | return -EINVAL; | 2322 | return -EINVAL; |
2323 | } | 2323 | } |
@@ -2353,7 +2353,7 @@ static int sci_remove(struct platform_device *dev) | |||
2353 | return 0; | 2353 | return 0; |
2354 | } | 2354 | } |
2355 | 2355 | ||
2356 | static int __devinit sci_probe_single(struct platform_device *dev, | 2356 | static int sci_probe_single(struct platform_device *dev, |
2357 | unsigned int index, | 2357 | unsigned int index, |
2358 | struct plat_sci_port *p, | 2358 | struct plat_sci_port *p, |
2359 | struct sci_port *sciport) | 2359 | struct sci_port *sciport) |
@@ -2383,7 +2383,7 @@ static int __devinit sci_probe_single(struct platform_device *dev, | |||
2383 | return 0; | 2383 | return 0; |
2384 | } | 2384 | } |
2385 | 2385 | ||
2386 | static int __devinit sci_probe(struct platform_device *dev) | 2386 | static int sci_probe(struct platform_device *dev) |
2387 | { | 2387 | { |
2388 | struct plat_sci_port *p = dev->dev.platform_data; | 2388 | struct plat_sci_port *p = dev->dev.platform_data; |
2389 | struct sci_port *sp = &sci_ports[dev->id]; | 2389 | struct sci_port *sp = &sci_ports[dev->id]; |