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

Commit e8cd4750 authored Jan 18, 2017 by Rafał Miłecki Committed by Kalle Valo Jan 20, 2017

brcmfmac: rename brcmf_bus_start function to brcmf_bus_started

This intends to make init/attach process slightly easier to follow.

What driver was doing in brcmf_bus_start wasn't bus specific at all and
function brcmf_bus_stop wasn't undoing things done there. This function
is supposed to be called by bus specific code when the bus is ready.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent bfa7295e

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -238,7 +238,7 @@ void brcmf_txcomplete(struct device dev, struct sk_buff txp, bool success);
	/* Configure the "global" bus state used by upper layers */		/* Configure the "global" bus state used by upper layers */
	void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);		void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);

	int brcmf_bus_start(struct device *dev);		int brcmf_bus_started(struct device *dev);
	s32 brcmf_iovar_data_set(struct device dev, char name, void *data, u32 len);		s32 brcmf_iovar_data_set(struct device dev, char name, void *data, u32 len);
	void brcmf_bus_add_txhdrlen(struct device *dev, uint len);		void brcmf_bus_add_txhdrlen(struct device *dev, uint len);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,7 @@ module_param_named(roamoff, brcmf_roamoff, int, S_IRUSR);
	MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");		MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");

	#ifdef DEBUG		#ifdef DEBUG
	/* always succeed brcmf_bus_start() */		/* always succeed brcmf_bus_started() */
	static int brcmf_ignore_probe_fail;		static int brcmf_ignore_probe_fail;
	module_param_named(ignore_probe_fail, brcmf_ignore_probe_fail, int, 0);		module_param_named(ignore_probe_fail, brcmf_ignore_probe_fail, int, 0);
	MODULE_PARM_DESC(ignore_probe_fail, "always succeed probe for debugging");		MODULE_PARM_DESC(ignore_probe_fail, "always succeed probe for debugging");

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -966,7 +966,7 @@ static int brcmf_revinfo_read(struct seq_file s, void data)
	return 0;		return 0;
	}		}

	int brcmf_bus_start(struct device *dev)		int brcmf_bus_started(struct device *dev)
	{		{
	int ret = -1;		int ret = -1;
	struct brcmf_bus *bus_if = dev_get_drvdata(dev);		struct brcmf_bus *bus_if = dev_get_drvdata(dev);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1572,7 +1572,7 @@ static int brcmf_pcie_attach_bus(struct brcmf_pciedev_info *devinfo)
	if (ret) {		if (ret) {
	brcmf_err("brcmf_attach failed\n");		brcmf_err("brcmf_attach failed\n");
	} else {		} else {
	ret = brcmf_bus_start(&devinfo->pdev->dev);		ret = brcmf_bus_started(&devinfo->pdev->dev);
	if (ret)		if (ret)
	brcmf_err("dongle is not responding\n");		brcmf_err("dongle is not responding\n");
	}		}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4065,7 +4065,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev,

	sdio_release_host(sdiodev->func[1]);		sdio_release_host(sdiodev->func[1]);

	err = brcmf_bus_start(dev);		err = brcmf_bus_started(dev);
	if (err != 0) {		if (err != 0) {
	brcmf_err("dongle is not responding\n");		brcmf_err("dongle is not responding\n");
	goto fail;		goto fail;