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 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
arch
/
sparc
/
kernel
/
vio.c
diff --git
a/arch/sparc/kernel/vio.c
b/arch/sparc/kernel/vio.c
index
348a886
..
01122a2
100644
(file)
--- a/
arch/sparc/kernel/vio.c
+++ b/
arch/sparc/kernel/vio.c
@@
-93,7
+93,7
@@
static int vio_device_probe(struct device *dev)
return drv->probe(vdev, id);
}
return drv->probe(vdev, id);
}
-static
int
vio_device_remove(struct device *dev)
+static
void
vio_device_remove(struct device *dev)
{
struct vio_dev *vdev = to_vio_dev(dev);
struct vio_driver *drv = to_vio_driver(dev->driver);
{
struct vio_dev *vdev = to_vio_dev(dev);
struct vio_driver *drv = to_vio_driver(dev->driver);
@@
-107,8
+107,6
@@
static int vio_device_remove(struct device *dev)
drv->remove(vdev);
}
drv->remove(vdev);
}
-
- return 0;
}
static ssize_t devspec_show(struct device *dev,
}
static ssize_t devspec_show(struct device *dev,