projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[powerpc.git]
/
arch
/
ppc
/
syslib
/
ocp.c
diff --git
a/arch/ppc/syslib/ocp.c
b/arch/ppc/syslib/ocp.c
index
e5fd2ae
..
ab34b1d
100644
(file)
--- a/
arch/ppc/syslib/ocp.c
+++ b/
arch/ppc/syslib/ocp.c
@@
-165,7
+165,7
@@
ocp_device_remove(struct device *dev)
}
static int
}
static int
-ocp_device_suspend(struct device *dev,
u32
state)
+ocp_device_suspend(struct device *dev,
pm_message_t
state)
{
struct ocp_device *ocp_dev = to_ocp_dev(dev);
struct ocp_driver *ocp_drv = to_ocp_drv(dev->driver);
{
struct ocp_device *ocp_dev = to_ocp_dev(dev);
struct ocp_driver *ocp_drv = to_ocp_drv(dev->driver);
@@
-189,6
+189,8
@@
ocp_device_resume(struct device *dev)
struct bus_type ocp_bus_type = {
.name = "ocp",
.match = ocp_device_match,
struct bus_type ocp_bus_type = {
.name = "ocp",
.match = ocp_device_match,
+ .probe = ocp_driver_probe,
+ .remove = ocp_driver_remove,
.suspend = ocp_device_suspend,
.resume = ocp_device_resume,
};
.suspend = ocp_device_suspend,
.resume = ocp_device_resume,
};
@@
-210,8
+212,6
@@
ocp_register_driver(struct ocp_driver *drv)
/* initialize common driver fields */
drv->driver.name = drv->name;
drv->driver.bus = &ocp_bus_type;
/* initialize common driver fields */
drv->driver.name = drv->name;
drv->driver.bus = &ocp_bus_type;
- drv->driver.probe = ocp_device_probe;
- drv->driver.remove = ocp_device_remove;
/* register with core */
return driver_register(&drv->driver);
/* register with core */
return driver_register(&drv->driver);