Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dd7de1f authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: rework usb callback operations 



The resume callbacks do partly the same a the probe callback
so put common code in separate function for use in the callbacks.
This also fixes suspend/resume regression introduced by

    brcmfmac: remove .init() callback for internal bus interface

    The .init() callback was the first function called by the common
    bus function brcmf_bus_start(). Given that it is not really
    necessary and the bus layer can call it before calling the
    brcmf_bus_start() function.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4faf28b7

drivers/net/wireless/brcm80211/brcmfmac/usb.c

+28 −20
Original line number Diff line number Diff line
@@ -1227,6 +1227,31 @@ static struct brcmf_bus_ops brcmf_usb_bus_ops = { 
	.rxctl = brcmf_usb_rx_ctlpkt,

};



static int brcmf_usb_bus_setup(struct brcmf_usbdev_info *devinfo)

{

	int ret;



	/* Attach to the common driver interface */

	ret = brcmf_attach(devinfo->dev);

	if (ret) {

		brcmf_err("brcmf_attach failed\n");

		return ret;

	}



	ret = brcmf_usb_up(devinfo->dev);

	if (ret)

		goto fail;



	ret = brcmf_bus_start(devinfo->dev);

	if (ret)

		goto fail;



	return 0;

fail:

	brcmf_detach(devinfo->dev);

	return ret;

}



static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)

{

	struct brcmf_bus *bus = NULL;
@@ -1255,23 +1280,9 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo) 
	bus->proto_type = BRCMF_PROTO_BCDC;

	bus->always_use_fws_queue = true;



	/* Attach to the common driver interface */

	ret = brcmf_attach(dev);

	if (ret) {

		brcmf_err("brcmf_attach failed\n");

		goto fail;

	}



	ret = brcmf_usb_up(dev);

	if (ret) {

		brcmf_detach(dev);

		goto fail;

	}



	ret = brcmf_bus_start(dev);

	ret = brcmf_usb_bus_setup(devinfo);

	if (ret) {

		brcmf_err("dongle is not responding\n");

		brcmf_detach(dev);

		goto fail;

	}
@@ -1461,10 +1472,7 @@ static int brcmf_usb_resume(struct usb_interface *intf) 
	struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(&usb->dev);



	brcmf_dbg(USB, "Enter\n");

	if (!brcmf_attach(devinfo->dev))

		return brcmf_bus_start(&usb->dev);



	return 0;

	return brcmf_usb_bus_setup(devinfo);

}



static int brcmf_usb_reset_resume(struct usb_interface *intf)
@@ -1475,7 +1483,7 @@ static int brcmf_usb_reset_resume(struct usb_interface *intf) 
	brcmf_dbg(USB, "Enter\n");



	if (!brcmf_usb_fw_download(devinfo))

		return brcmf_usb_resume(intf);

		return brcmf_usb_bus_setup(devinfo);



	return -EIO;

}