From: David Kershner Date: Mon, 19 Sep 2016 21:09:24 +0000 (-0400) Subject: staging: unisys: visorbus: move parahotplug_process_list X-Git-Tag: v4.9-rc1~119^2~358 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a9c73937436a412aed24c08595a31b7bf9e10dd6;p=karo-tx-linux.git staging: unisys: visorbus: move parahotplug_process_list The function parahotplug_process_list needs to be moved lower in the file to avoid extraneous function prototypes. Reported-by: Greg Kroah-Hartman Signed-off-by: David Kershner Reviewed-by: Tim Sell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index d8e58266c4f9..468286bb13f3 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -179,7 +179,6 @@ struct parahotplug_request { static LIST_HEAD(parahotplug_request_list); static DEFINE_SPINLOCK(parahotplug_request_list_lock); /* lock for above */ -static void parahotplug_process_list(void); /* info for /dev/visorchipset */ static dev_t major_dev = -1; /*< indicates major num for device */ @@ -1465,37 +1464,6 @@ parahotplug_request_kickoff(struct parahotplug_request *req) envp); } -/** - * parahotplug_process_list() - remove any request from the list that's been on - * there too long and respond with an error - */ -static void -parahotplug_process_list(void) -{ - struct list_head *pos; - struct list_head *tmp; - - spin_lock(¶hotplug_request_list_lock); - - list_for_each_safe(pos, tmp, ¶hotplug_request_list) { - struct parahotplug_request *req = - list_entry(pos, struct parahotplug_request, list); - - if (!time_after_eq(jiffies, req->expiration)) - continue; - - list_del(pos); - if (req->msg.hdr.flags.response_expected) - controlvm_respond_physdev_changestate( - &req->msg.hdr, - CONTROLVM_RESP_ERROR_DEVICE_UDEV_TIMEOUT, - req->msg.cmd.device_change_state.state); - parahotplug_request_destroy(req); - } - - spin_unlock(¶hotplug_request_list_lock); -} - /** * parahotplug_request_complete() - mark request as complete * @id: the id of the request @@ -2091,6 +2059,37 @@ read_controlvm_event(struct controlvm_message *msg) return false; } +/** + * parahotplug_process_list() - remove any request from the list that's been on + * there too long and respond with an error + */ +static void +parahotplug_process_list(void) +{ + struct list_head *pos; + struct list_head *tmp; + + spin_lock(¶hotplug_request_list_lock); + + list_for_each_safe(pos, tmp, ¶hotplug_request_list) { + struct parahotplug_request *req = + list_entry(pos, struct parahotplug_request, list); + + if (!time_after_eq(jiffies, req->expiration)) + continue; + + list_del(pos); + if (req->msg.hdr.flags.response_expected) + controlvm_respond_physdev_changestate( + &req->msg.hdr, + CONTROLVM_RESP_ERROR_DEVICE_UDEV_TIMEOUT, + req->msg.cmd.device_change_state.state); + parahotplug_request_destroy(req); + } + + spin_unlock(¶hotplug_request_list_lock); +} + static void controlvm_periodic_work(struct work_struct *work) {