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.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[linux-2.6-microblaze.git]
/
arch
/
parisc
/
kernel
/
drivers.c
diff --git
a/arch/parisc/kernel/drivers.c
b/arch/parisc/kernel/drivers.c
index
80fa065
..
776d624
100644
(file)
--- a/
arch/parisc/kernel/drivers.c
+++ b/
arch/parisc/kernel/drivers.c
@@
-133,14
+133,13
@@
static int parisc_driver_probe(struct device *dev)
return rc;
}
return rc;
}
-static
int
__exit parisc_driver_remove(struct device *dev)
+static
void
__exit parisc_driver_remove(struct device *dev)
{
struct parisc_device *pa_dev = to_parisc_device(dev);
struct parisc_driver *pa_drv = to_parisc_driver(dev->driver);
{
struct parisc_device *pa_dev = to_parisc_device(dev);
struct parisc_driver *pa_drv = to_parisc_driver(dev->driver);
+
if (pa_drv->remove)
pa_drv->remove(pa_dev);
if (pa_drv->remove)
pa_drv->remove(pa_dev);
-
- return 0;
}
}