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

Commit 34789d0c authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: use wiphy debugfs dir entry 



The driver used to create a brcmfmac dir entry at the top level
debugfs mount point. This moves the debugfs entries into the
wiphy debugfs dir entry.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 856d5a01

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

+6 −0
Original line number Diff line number Diff line
@@ -445,6 +445,11 @@ brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr) 
	return 0;

}



static void brcmf_proto_bcdc_debugfs_create(struct brcmf_pub *drvr)

{

	brcmf_fws_debugfs_create(drvr);

}



int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)

{

	struct brcmf_bcdc *bcdc;
@@ -472,6 +477,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) 
	drvr->proto->del_if = brcmf_proto_bcdc_del_if;

	drvr->proto->reset_if = brcmf_proto_bcdc_reset_if;

	drvr->proto->init_done = brcmf_proto_bcdc_init_done;

	drvr->proto->debugfs_create = brcmf_proto_bcdc_debugfs_create;

	drvr->proto->pd = bcdc;



	drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;

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

+0 −5
Original line number Diff line number Diff line
@@ -524,9 +524,6 @@ static int __init brcmfmac_module_init(void) 
{

	int err;



	/* Initialize debug system first */

	brcmf_debugfs_init();



	/* Get the platform data (if available) for our devices */

	err = platform_driver_probe(&brcmf_pd, brcmf_common_pd_probe);

	if (err == -ENODEV)
@@ -538,7 +535,6 @@ static int __init brcmfmac_module_init(void) 
	/* Continue the initialization by registering the different busses */

	err = brcmf_core_init();

	if (err) {

		brcmf_debugfs_exit();

		if (brcmfmac_pdata)

			platform_driver_unregister(&brcmf_pd);

	}
@@ -551,7 +547,6 @@ static void __exit brcmfmac_module_exit(void) 
	brcmf_core_exit();

	if (brcmfmac_pdata)

		platform_driver_unregister(&brcmf_pd);

	brcmf_debugfs_exit();

}



module_init(brcmfmac_module_init);

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

+5 −6
Original line number Diff line number Diff line
@@ -972,8 +972,6 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops) 
	if (ret < 0)

		goto fail;



	brcmf_debugfs_add_entry(drvr, "revinfo", brcmf_revinfo_read);



	brcmf_feat_attach(drvr);



	ret = brcmf_proto_init_done(drvr);
@@ -1016,6 +1014,11 @@ static int brcmf_bus_started(struct brcmf_pub *drvr, struct cfg80211_ops *ops) 
#endif

#endif /* CONFIG_INET */



	/* populate debugfs */

	brcmf_debugfs_add_entry(drvr, "revinfo", brcmf_revinfo_read);

	brcmf_feat_debugfs_create(drvr);

	brcmf_proto_debugfs_create(drvr);



	return 0;



fail:
@@ -1068,9 +1071,6 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) 
	drvr->bus_if->drvr = drvr;

	drvr->settings = settings;



	/* attach debug facilities */

	brcmf_debug_attach(drvr);



	/* Attach and link in the protocol */

	ret = brcmf_proto_attach(drvr);

	if (ret != 0) {
@@ -1160,7 +1160,6 @@ void brcmf_detach(struct device *dev) 


	brcmf_proto_detach(drvr);



	brcmf_debug_detach(drvr);

	bus_if->drvr = NULL;

	wiphy_free(drvr->wiphy);

}

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

+3 −39
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include "fweh.h"

#include "debug.h"



static struct dentry *root_folder;



int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,

			       size_t len)

{
@@ -54,44 +52,9 @@ int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data, 
	return 0;

}



void brcmf_debugfs_init(void)

{

	root_folder = debugfs_create_dir(KBUILD_MODNAME, NULL);

	if (IS_ERR(root_folder))

		root_folder = NULL;

}



void brcmf_debugfs_exit(void)

{

	if (!root_folder)

		return;



	debugfs_remove_recursive(root_folder);

	root_folder = NULL;

}



int brcmf_debug_attach(struct brcmf_pub *drvr)

{

	struct device *dev = drvr->bus_if->dev;



	if (!root_folder)

		return -ENODEV;



	drvr->dbgfs_dir = debugfs_create_dir(dev_name(dev), root_folder);

	return PTR_ERR_OR_ZERO(drvr->dbgfs_dir);

}



void brcmf_debug_detach(struct brcmf_pub *drvr)

{

	brcmf_fweh_unregister(drvr, BRCMF_E_PSM_WATCHDOG);



	if (!IS_ERR_OR_NULL(drvr->dbgfs_dir))

		debugfs_remove_recursive(drvr->dbgfs_dir);

}



struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr)

{

	return drvr->dbgfs_dir;

	return drvr->wiphy->debugfsdir;

}



int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
@@ -99,7 +62,8 @@ int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn, 
{

	struct dentry *e;



	WARN(!drvr->wiphy->debugfsdir, "wiphy not (yet) registered\n");

	e = debugfs_create_devm_seqfile(drvr->bus_if->dev, fn,

					drvr->dbgfs_dir, read_fn);

					drvr->wiphy->debugfsdir, read_fn);

	return PTR_ERR_OR_ZERO(e);

}

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

+0 −17
Original line number Diff line number Diff line
@@ -113,29 +113,12 @@ extern int brcmf_msg_level; 
struct brcmf_bus;

struct brcmf_pub;

#ifdef DEBUG

void brcmf_debugfs_init(void);

void brcmf_debugfs_exit(void);

int brcmf_debug_attach(struct brcmf_pub *drvr);

void brcmf_debug_detach(struct brcmf_pub *drvr);

struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);

int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,

			    int (*read_fn)(struct seq_file *seq, void *data));

int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,

			       size_t len);

#else

static inline void brcmf_debugfs_init(void)

{

}

static inline void brcmf_debugfs_exit(void)

{

}

static inline int brcmf_debug_attach(struct brcmf_pub *drvr)

{

	return 0;

}

static inline void brcmf_debug_detach(struct brcmf_pub *drvr)

{

}

static inline

int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,

			    int (*read_fn)(struct seq_file *seq, void *data))