projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tty-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[linux-2.6-microblaze.git]
/
drivers
/
tty
/
serial
/
max3100.c
diff --git
a/drivers/tty/serial/max3100.c
b/drivers/tty/serial/max3100.c
index
9494690
..
0b5f21f
100644
(file)
--- a/
drivers/tty/serial/max3100.c
+++ b/
drivers/tty/serial/max3100.c
@@
-804,7
+804,7
@@
static int max3100_probe(struct spi_device *spi)
return 0;
}
return 0;
}
-static
int
max3100_remove(struct spi_device *spi)
+static
void
max3100_remove(struct spi_device *spi)
{
struct max3100_port *s = spi_get_drvdata(spi);
int i;
{
struct max3100_port *s = spi_get_drvdata(spi);
int i;
@@
-827,13
+827,12
@@
static int max3100_remove(struct spi_device *spi)
for (i = 0; i < MAX_MAX3100; i++)
if (max3100s[i]) {
mutex_unlock(&max3100s_lock);
for (i = 0; i < MAX_MAX3100; i++)
if (max3100s[i]) {
mutex_unlock(&max3100s_lock);
- return
0
;
+ return;
}
pr_debug("removing max3100 driver\n");
uart_unregister_driver(&max3100_uart_driver);
mutex_unlock(&max3100s_lock);
}
pr_debug("removing max3100 driver\n");
uart_unregister_driver(&max3100_uart_driver);
mutex_unlock(&max3100s_lock);
- return 0;
}
#ifdef CONFIG_PM_SLEEP
}
#ifdef CONFIG_PM_SLEEP