From 24456a09a830dc44ace4d0db8e29d1e367937b58 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 2 Dec 2015 18:23:27 +0100 Subject: [PATCH] greybus: svc: clean up deferred hotplug handler Rename the hotplug request message, and clarify that the message size has already been verified by the primary handler. Also add a debug message that includes the interface id. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/svc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c index 2c2dd8e66d7d..476914c88832 100644 --- a/drivers/staging/greybus/svc.c +++ b/drivers/staging/greybus/svc.c @@ -359,7 +359,7 @@ static void svc_process_hotplug(struct work_struct *work) { struct svc_hotplug *svc_hotplug = container_of(work, struct svc_hotplug, work); - struct gb_svc_intf_hotplug_request *hotplug = &svc_hotplug->data; + struct gb_svc_intf_hotplug_request *request; struct gb_connection *connection = svc_hotplug->connection; struct gb_svc *svc = connection->private; struct gb_host_device *hd = connection->hd; @@ -367,10 +367,11 @@ static void svc_process_hotplug(struct work_struct *work) u8 intf_id, device_id; int ret; - /* - * Grab the information we need. - */ - intf_id = hotplug->intf_id; + /* The request message size has already been verified. */ + request = &svc_hotplug->data; + intf_id = request->intf_id; + + dev_dbg(&svc->dev, "%s - id = %u\n", __func__, intf_id); intf = gb_interface_find(hd, intf_id); if (intf) { @@ -404,10 +405,10 @@ static void svc_process_hotplug(struct work_struct *work) if (ret) goto destroy_interface; - intf->unipro_mfg_id = le32_to_cpu(hotplug->data.unipro_mfg_id); - intf->unipro_prod_id = le32_to_cpu(hotplug->data.unipro_prod_id); - intf->vendor_id = le32_to_cpu(hotplug->data.ara_vend_id); - intf->product_id = le32_to_cpu(hotplug->data.ara_prod_id); + intf->unipro_mfg_id = le32_to_cpu(request->data.unipro_mfg_id); + intf->unipro_prod_id = le32_to_cpu(request->data.unipro_prod_id); + intf->vendor_id = le32_to_cpu(request->data.ara_vend_id); + intf->product_id = le32_to_cpu(request->data.ara_prod_id); /* * Create a device id for the interface: -- 2.20.1