lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen/xenbus: fixup checkpatch issues in xenbus_probe*

Browse Source 
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Ian Campbell
2010-12-10 14:39:15 +00:00
committed by Konrad Rzeszutek Wilk
parent 7003087ce0
commit 6bac7f9f9e
5 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/xen/xenbus/xenbus_probe.c
View File

@@ -126,9 +126,11 @@ static int talk_to_otherend(struct xenbus_device *dev)
static int watch_otherend(struct xenbus_device *dev) static int watch_otherend(struct xenbus_device *dev)
{ {
struct xen_bus_type *bus = container_of(dev->dev.bus, struct xen_bus_type, bus); struct xen_bus_type *bus =
container_of(dev->dev.bus, struct xen_bus_type, bus);
return xenbus_watch_pathfmt(dev, &dev->otherend_watch, bus->otherend_changed, return xenbus_watch_pathfmt(dev, &dev->otherend_watch,
bus->otherend_changed,
"%s/%s", dev->otherend, "state"); "%s/%s", dev->otherend, "state");
} }
@@ -579,7 +581,8 @@ int xenbus_dev_suspend(struct device *dev, pm_message_t state)
{ {
int err = 0; int err = 0;
struct xenbus_driver *drv; struct xenbus_driver *drv;
struct xenbus_device *xdev = container_of(dev, struct xenbus_device, dev); struct xenbus_device *xdev
= container_of(dev, struct xenbus_device, dev);
DPRINTK("%s", xdev->nodename); DPRINTK("%s", xdev->nodename);
@@ -599,7 +602,8 @@ int xenbus_dev_resume(struct device *dev)
{ {
int err; int err;
struct xenbus_driver *drv; struct xenbus_driver *drv;
struct xenbus_device *xdev = container_of(dev, struct xenbus_device, dev); struct xenbus_device *xdev
= container_of(dev, struct xenbus_device, dev);
DPRINTK("%s", xdev->nodename); DPRINTK("%s", xdev->nodename);

6
drivers/xen/xenbus/xenbus_probe.h
View File

@@ -41,8 +41,10 @@ struct xen_bus_type
char *root; char *root;
unsigned int levels; unsigned int levels;
int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename); int (*get_bus_id)(char bus_id[XEN_BUS_ID_SIZE], const char *nodename);
int (*probe)(struct xen_bus_type *bus, const char *type, const char *dir); int (*probe)(struct xen_bus_type *bus, const char *type,
void (*otherend_changed)(struct xenbus_watch *watch, const char **vec, unsigned int len); const char *dir);
void (*otherend_changed)(struct xenbus_watch *watch, const char **vec,
unsigned int len);
struct bus_type bus; struct bus_type bus;
}; };

41
drivers/xen/xenbus/xenbus_probe_backend.c
View File

@@ -84,8 +84,8 @@ static int backend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename)
if (err) if (err)
return err; return err;
if (snprintf(bus_id, XEN_BUS_ID_SIZE, if (snprintf(bus_id, XEN_BUS_ID_SIZE, "%.*s-%i-%s",
"%.*s-%i-%s", typelen, type, domid, devid) >= XEN_BUS_ID_SIZE) typelen, type, domid, devid) >= XEN_BUS_ID_SIZE)
return -ENOSPC; return -ENOSPC;
return 0; return 0;
} }
@@ -147,7 +147,8 @@ static int xenbus_probe_backend_unit(struct xen_bus_type *bus,
} }
/* backend/<typename>/<frontend-domid> */ /* backend/<typename>/<frontend-domid> */
static int xenbus_probe_backend(struct xen_bus_type *bus, const char *type, const char *domid) static int xenbus_probe_backend(struct xen_bus_type *bus, const char *type,
const char *domid)
{ {
char *nodename; char *nodename;
int err = 0; int err = 0;
@@ -188,18 +189,18 @@ static struct device_attribute xenbus_backend_dev_attrs[] = {
static struct xen_bus_type xenbus_backend = { static struct xen_bus_type xenbus_backend = {
.root = "backend", .root = "backend",
.levels = 3, /* backend/type/<frontend>/<id> */ .levels = 3, /* backend/type/<frontend>/<id> */
.get_bus_id = backend_bus_id, .get_bus_id = backend_bus_id,
.probe = xenbus_probe_backend, .probe = xenbus_probe_backend,
.otherend_changed = frontend_changed, .otherend_changed = frontend_changed,
.bus = { .bus = {
.name = "xen-backend", .name = "xen-backend",
.match = xenbus_match, .match = xenbus_match,
.uevent = xenbus_uevent_backend, .uevent = xenbus_uevent_backend,
.probe = xenbus_dev_probe, .probe = xenbus_dev_probe,
.remove = xenbus_dev_remove, .remove = xenbus_dev_remove,
.shutdown = xenbus_dev_shutdown, .shutdown = xenbus_dev_shutdown,
.dev_attrs = xenbus_backend_dev_attrs, .dev_attrs = xenbus_backend_dev_attrs,
}, },
}; };
@@ -221,24 +222,6 @@ static int read_frontend_details(struct xenbus_device *xendev)
return xenbus_read_otherend_details(xendev, "frontend-id", "frontend"); return xenbus_read_otherend_details(xendev, "frontend-id", "frontend");
} }
//void xenbus_backend_suspend(int (*fn)(struct device *, void *))
//{
// DPRINTK("");
// bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, fn);
//}
//void xenbus_backend_resume(int (*fn)(struct device *, void *))
//{
// DPRINTK("");
// bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, fn);
//}
//int xenbus_for_each_backend(void *arg, int (*fn)(struct device *, void *))
//{
// return bus_for_each_dev(&xenbus_backend.bus, NULL, arg, fn);
//}
//EXPORT_SYMBOL_GPL(xenbus_for_each_backend);
int xenbus_dev_is_online(struct xenbus_device *dev) int xenbus_dev_is_online(struct xenbus_device *dev)
{ {
int rc, val; int rc, val;

26
drivers/xen/xenbus/xenbus_probe_frontend.c
View File

@@ -46,7 +46,8 @@ static int frontend_bus_id(char bus_id[XEN_BUS_ID_SIZE], const char *nodename)
} }
/* device/<typename>/<name> */ /* device/<typename>/<name> */
static int xenbus_probe_frontend(struct xen_bus_type *bus, const char *type, const char *name) static int xenbus_probe_frontend(struct xen_bus_type *bus, const char *type,
const char *name)
{ {
char *nodename; char *nodename;
int err; int err;
@@ -62,7 +63,8 @@ static int xenbus_probe_frontend(struct xen_bus_type *bus, const char *type, con
return err; return err;
} }
static int xenbus_uevent_frontend(struct device *_dev, struct kobj_uevent_env *env) static int xenbus_uevent_frontend(struct device *_dev,
struct kobj_uevent_env *env)
{ {
struct xenbus_device *dev = to_xenbus_device(_dev); struct xenbus_device *dev = to_xenbus_device(_dev);
@@ -85,21 +87,21 @@ static struct device_attribute xenbus_frontend_dev_attrs[] = {
static struct xen_bus_type xenbus_frontend = { static struct xen_bus_type xenbus_frontend = {
.root = "device", .root = "device",
.levels = 2, /* device/type/<id> */ .levels = 2, /* device/type/<id> */
.get_bus_id = frontend_bus_id, .get_bus_id = frontend_bus_id,
.probe = xenbus_probe_frontend, .probe = xenbus_probe_frontend,
.otherend_changed = backend_changed, .otherend_changed = backend_changed,
.bus = { .bus = {
.name = "xen", .name = "xen",
.match = xenbus_match, .match = xenbus_match,
.uevent = xenbus_uevent_frontend, .uevent = xenbus_uevent_frontend,
.probe = xenbus_dev_probe, .probe = xenbus_dev_probe,
.remove = xenbus_dev_remove, .remove = xenbus_dev_remove,
.shutdown = xenbus_dev_shutdown, .shutdown = xenbus_dev_shutdown,
.dev_attrs= xenbus_frontend_dev_attrs, .dev_attrs = xenbus_frontend_dev_attrs,
.suspend = xenbus_dev_suspend, .suspend = xenbus_dev_suspend,
.resume = xenbus_dev_resume, .resume = xenbus_dev_resume,
}, },
}; };