diff options
Diffstat (limited to 'at76_usb.c')
| -rw-r--r-- | at76_usb.c | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -4264,10 +4264,8 @@ static int at76_init_new_device(struct at76_priv *priv) /* Download external firmware */ -static void at76_work_external_fw(struct work_struct *work) +static void at76_load_external_fw(struct at76_priv *priv) { - struct at76_priv *priv = container_of(work, struct at76_priv, - work_external_fw); int ret; int op_mode; @@ -4307,10 +4305,8 @@ static void at76_work_external_fw(struct work_struct *work) /* Download internal firmware */ -static void at76_work_internal_fw(struct work_struct *work) +static void at76_load_internal_fw(struct at76_priv *priv) { - struct at76_priv *priv = container_of(work, struct at76_priv, - work_internal_fw); int ret; mutex_lock(&priv->mtx); @@ -6127,8 +6123,6 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev, mutex_init(&priv->mtx); INIT_WORK(&priv->work_assoc_done, at76_work_assoc_done); - INIT_WORK(&priv->work_external_fw, at76_work_external_fw); - INIT_WORK(&priv->work_internal_fw, at76_work_internal_fw); INIT_WORK(&priv->work_join, at76_work_join); INIT_WORK(&priv->work_mgmt_timeout, at76_work_mgmt_timeout); INIT_WORK(&priv->work_new_bss, at76_work_new_bss); @@ -6285,7 +6279,7 @@ static int at76_probe(struct usb_interface *interface, /* download internal firmware part */ at76_dbg(DBG_DEVSTART, "downloading internal firmware"); priv->istate = INTFW_DOWNLOAD; - schedule_work(&priv->work_internal_fw); + at76_load_internal_fw(priv); } else { /* Internal firmware already inside the device. Get firmware * version to test if external firmware is loaded. @@ -6320,7 +6314,7 @@ static int at76_probe(struct usb_interface *interface, "- download external firmware", ret); priv->istate = EXTFW_DOWNLOAD; - schedule_work(&priv->work_external_fw); + at76_load_external_fw(priv); } else { priv->istate = INIT; if ((ret = at76_init_new_device(priv)) < 0) |