openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: svc: clean up hotplug/unplug request handlers 

Clean up hotplug/unplug request handlers somewhat.

Also add a debug message to both handlers that includes the interface id.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2015-12-02 18:23:26 +01:00 committed by Greg Kroah-Hartman
parent f1e941a6e4
commit d34a3643fe
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/greybus/svc.c
View File

@ -480,22 +480,25 @@ static void svc_process_hotplug(struct work_struct *work)
static int gb_svc_intf_hotplug_recv(struct gb_operation *op) static int gb_svc_intf_hotplug_recv(struct gb_operation *op)
{ {
struct gb_svc *svc = op->connection->private; struct gb_svc *svc = op->connection->private;
struct gb_message *request = op->request; struct gb_svc_intf_hotplug_request *request;
struct svc_hotplug *svc_hotplug; struct svc_hotplug *svc_hotplug;
if (request->payload_size < sizeof(svc_hotplug->data)) { if (op->request->payload_size < sizeof(*request)) {
dev_warn(&svc->dev, "short hotplug request received (%zu < %zu)\n", dev_warn(&svc->dev, "short hotplug request received (%zu < %zu)\n",
request->payload_size, op->request->payload_size, sizeof(*request));
sizeof(svc_hotplug->data));
return -EINVAL; return -EINVAL;
} }
request = op->request->payload;
dev_dbg(&svc->dev, "%s - id = %u\n", __func__, request->intf_id);
svc_hotplug = kmalloc(sizeof(*svc_hotplug), GFP_KERNEL); svc_hotplug = kmalloc(sizeof(*svc_hotplug), GFP_KERNEL);
if (!svc_hotplug) if (!svc_hotplug)
return -ENOMEM; return -ENOMEM;
svc_hotplug->connection = op->connection; svc_hotplug->connection = op->connection;
memcpy(&svc_hotplug->data, op->request->payload, sizeof(svc_hotplug->data)); memcpy(&svc_hotplug->data, request, sizeof(svc_hotplug->data));
INIT_WORK(&svc_hotplug->work, svc_process_hotplug); INIT_WORK(&svc_hotplug->work, svc_process_hotplug);
queue_work(system_unbound_wq, &svc_hotplug->work); queue_work(system_unbound_wq, &svc_hotplug->work);
@ -506,20 +509,21 @@ static int gb_svc_intf_hotplug_recv(struct gb_operation *op)
static int gb_svc_intf_hot_unplug_recv(struct gb_operation *op) static int gb_svc_intf_hot_unplug_recv(struct gb_operation *op)
{ {
struct gb_svc *svc = op->connection->private; struct gb_svc *svc = op->connection->private;
struct gb_message *request = op->request; struct gb_svc_intf_hot_unplug_request *request;
struct gb_svc_intf_hot_unplug_request *hot_unplug = request->payload;
struct gb_host_device *hd = op->connection->hd; struct gb_host_device *hd = op->connection->hd;
struct gb_interface *intf; struct gb_interface *intf;
u8 intf_id; u8 intf_id;
if (request->payload_size < sizeof(*hot_unplug)) { if (op->request->payload_size < sizeof(*request)) {
dev_warn(&svc->dev, "short hot unplug request received (%zu < %zu)\n", dev_warn(&svc->dev, "short hot unplug request received (%zu < %zu)\n",
request->payload_size, op->request->payload_size, sizeof(*request));
sizeof(*hot_unplug));
return -EINVAL; return -EINVAL;
} }
intf_id = hot_unplug->intf_id; request = op->request->payload;
intf_id = request->intf_id;
dev_dbg(&svc->dev, "%s - id = %u\n", __func__, intf_id);
intf = gb_interface_find(hd, intf_id); intf = gb_interface_find(hd, intf_id);
if (!intf) { if (!intf) {