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 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[linux-2.6-microblaze.git]
/
arch
/
powerpc
/
platforms
/
ps3
/
system-bus.c
diff --git
a/arch/powerpc/platforms/ps3/system-bus.c
b/arch/powerpc/platforms/ps3/system-bus.c
index
1a56658
..
c8b50fe
100644
(file)
--- a/
arch/powerpc/platforms/ps3/system-bus.c
+++ b/
arch/powerpc/platforms/ps3/system-bus.c
@@
-381,7
+381,7
@@
static int ps3_system_bus_probe(struct device *_dev)
return result;
}
return result;
}
-static
int
ps3_system_bus_remove(struct device *_dev)
+static
void
ps3_system_bus_remove(struct device *_dev)
{
struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
struct ps3_system_bus_driver *drv;
{
struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
struct ps3_system_bus_driver *drv;
@@
-399,7
+399,6
@@
static int ps3_system_bus_remove(struct device *_dev)
__func__, __LINE__, drv->core.name);
pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev_name(&dev->core));
__func__, __LINE__, drv->core.name);
pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev_name(&dev->core));
- return 0;
}
static void ps3_system_bus_shutdown(struct device *_dev)
}
static void ps3_system_bus_shutdown(struct device *_dev)
@@
-663,7
+662,7
@@
static int ps3_ioc0_map_sg(struct device *_dev, struct scatterlist *sg,
unsigned long attrs)
{
BUG();
unsigned long attrs)
{
BUG();
- return
0
;
+ return
-EINVAL
;
}
static void ps3_sb_unmap_sg(struct device *_dev, struct scatterlist *sg,
}
static void ps3_sb_unmap_sg(struct device *_dev, struct scatterlist *sg,