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 'cxl-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl
[linux-2.6-microblaze.git]
/
drivers
/
cxl
/
core
/
bus.c
diff --git
a/drivers/cxl/core/bus.c
b/drivers/cxl/core/bus.c
index
37b87ad
..
267d804
100644
(file)
--- a/
drivers/cxl/core/bus.c
+++ b/
drivers/cxl/core/bus.c
@@
-614,13
+614,12
@@
static int cxl_bus_probe(struct device *dev)
return to_cxl_drv(dev->driver)->probe(dev);
}
return to_cxl_drv(dev->driver)->probe(dev);
}
-static
int
cxl_bus_remove(struct device *dev)
+static
void
cxl_bus_remove(struct device *dev)
{
struct cxl_driver *cxl_drv = to_cxl_drv(dev->driver);
if (cxl_drv->remove)
cxl_drv->remove(dev);
{
struct cxl_driver *cxl_drv = to_cxl_drv(dev->driver);
if (cxl_drv->remove)
cxl_drv->remove(dev);
- return 0;
}
struct bus_type cxl_bus_type = {
}
struct bus_type cxl_bus_type = {