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

Commit 030c69cf authored by Jack Pham's avatar Jack Pham
Browse files

Revert "USB: Debugfs: Fix compilation issues when debugfs is disabled" 



This reverts commit 1eb4c9cb.
There is a bug in this change that causes a crash when
gbam_cleanup() is called multiple times.

Change-Id: Ic5f8b8168bbaa52f3417812a268097c23f6e7514
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent 01364e16

drivers/usb/gadget/f_diag.c

+6 −17
Original line number Diff line number Diff line
@@ -837,28 +837,17 @@ static const struct file_operations debug_fdiag_ops = { 
struct dentry *dent_diag;

static void fdiag_debugfs_init(void)

{

	struct dentry *dent_diag_status;

	dent_diag = debugfs_create_dir("usb_diag", 0);

	if (!dent_diag || IS_ERR(dent_diag))

	if (IS_ERR(dent_diag))

		return;



	dent_diag_status = debugfs_create_file("status", 0444, dent_diag, 0,

			&debug_fdiag_ops);



	if (!dent_diag_status || IS_ERR(dent_diag_status)) {

		debugfs_remove(dent_diag);

		dent_diag = NULL;

		return;

	}

	debugfs_create_file("status", 0444, dent_diag, 0, &debug_fdiag_ops);

}



static void fdiag_debugfs_remove(void)

#else

static void fdiag_debugfs_init(void)

{

	debugfs_remove_recursive(dent_diag);

	return;

}

#else

static inline void fdiag_debugfs_init(void) {}

static inline void fdiag_debugfs_remove(void) {}

#endif



static void diag_cleanup(void)
@@ -867,7 +856,7 @@ static void diag_cleanup(void) 
	struct usb_diag_ch *_ch;

	unsigned long flags;



	fdiag_debugfs_remove();

	debugfs_remove_recursive(dent_diag);



	list_for_each_safe(act, tmp, &usb_diag_ch_list) {

		_ch = list_entry(act, struct usb_diag_ch, list);

drivers/usb/gadget/f_rmnet.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ static int frmnet_bind_config(struct usb_configuration *c, unsigned portno) 
static void frmnet_unbind_config(void)

{

	int i;

	gbam_cleanup();



	for (i = 0; i < nr_rmnet_ports; i++)

		if (rmnet_ports[i].data_xport == USB_GADGET_XPORT_ETHER)

			gether_cleanup(rmnet_ports[i].port->dev);

drivers/usb/gadget/f_rmnet_smd.c

+8 −14
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger

 * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com)

 * Copyright (C) 2008 Nokia Corporation

 * Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -1267,17 +1267,19 @@ const struct file_operations rmnet_smd_debug_stats_ops = { 
};



struct dentry *dent_smd;

struct dentry *dent_smd_status;



static void rmnet_smd_debugfs_init(struct rmnet_smd_dev *dev)

{

	struct dentry *dent_smd_status;



	dent_smd = debugfs_create_dir("usb_rmnet_smd", 0);

	if (!dent_smd || IS_ERR(dent_smd))

	if (IS_ERR(dent_smd))

		return;



	dent_smd_status = debugfs_create_file("status", 0444, dent_smd, dev,

			&rmnet_smd_debug_stats_ops);



	if (!dent_smd_status || IS_ERR(dent_smd_status)) {

	if (!dent_smd_status) {

		debugfs_remove(dent_smd);

		dent_smd = NULL;

		return;
@@ -1285,14 +1287,8 @@ static void rmnet_smd_debugfs_init(struct rmnet_smd_dev *dev) 


	return;

}



static void rmnet_smd_debugfs_remove(void)

{

	debugfs_remove_recursive(dent_smd);

}

#else

static inline void rmnet_smd_debugfs_init(struct rmnet_smd_dev *dev) {}

static inline void rmnet_smd_debugfs_remove(void){}

static void rmnet_smd_debugfs_init(struct rmnet_smd_dev *dev) {}

#endif



static void
@@ -1311,9 +1307,7 @@ rmnet_smd_unbind(struct usb_configuration *c, struct usb_function *f) 
	dev->epout = dev->epin = dev->epnotify = NULL; /* release endpoints */



	destroy_workqueue(dev->wq);



	rmnet_smd_debugfs_remove();



	debugfs_remove_recursive(dent_smd);

	kfree(dev);



}

drivers/usb/gadget/f_rmnet_smd_sdio.c

+6 −18
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger

 * Copyright (C) 2003 Al Borchers (alborchers@steinerpoint.com)

 * Copyright (C) 2008 Nokia Corporation

 * Copyright (c) 2011,2013 The Linux Foundation. All rights reserved.

 * Copyright (c) 2011 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1758,28 +1758,16 @@ struct dentry *dent_rmnet_mux; 


static void rmnet_mux_debugfs_init(struct rmnet_mux_dev *dev)

{

	struct dentry *dent_rmnet_mux_status;



	dent_rmnet_mux = debugfs_create_dir("usb_rmnet_mux", 0);

	if (!dent_rmnet_mux || IS_ERR(dent_rmnet_mux))

	if (IS_ERR(dent_rmnet_mux))

		return;



	dent_rmnet_mux_status = debugfs_create_file("status",

			0444, dent_rmnet_mux, dev,

	debugfs_create_file("status", 0444, dent_rmnet_mux, dev,

			&rmnet_mux_svlte_debug_stats_ops);

	if (!dent_rmnet_mux_status) {

		debugfs_remove(dent_rmnet_mux);

		dent_rmnet_mux = NULL;

		return;

	}

}



static void rmnet_mux_debugfs_remove(void)

{

	debugfs_remove_recursive(dent_rmnet_mux);

}

#else

static inline void rmnet_mux_debugfs_init(struct rmnet_mux_dev *dev) {}

static inline void rmnet_mux_debugfs_remove(void) {}

static void rmnet_mux_debugfs_init(struct rmnet_mux_dev *dev) {}

#endif



int usb_rmnet_mux_ctrl_open(struct inode *inode, struct file *fp)
@@ -2049,7 +2037,7 @@ static void rmnet_smd_sdio_cleanup(void) 
	struct rmnet_mux_dev *dev = rmux_dev;

	struct rmnet_mux_smd_dev *smd_dev = &dev->smd_dev;



	rmnet_mux_debugfs_remove();

	debugfs_remove_recursive(dent_rmnet_mux);

	misc_deregister(&rmnet_mux_ctrl_dev);

	smd_close(smd_dev->smd_data.ch);

	destroy_workqueue(dev->wq);

drivers/usb/gadget/u_bam.c

+9 −22
Original line number Diff line number Diff line
@@ -1258,30 +1258,22 @@ const struct file_operations gbam_stats_ops = { 
	.write = gbam_reset_stats,

};



struct dentry *gbam_dent;

static void gbam_debugfs_init(void)

{

	struct dentry *dent;

	struct dentry *dfile;



	gbam_dent = debugfs_create_dir("usb_rmnet", 0);

	if (!gbam_dent || IS_ERR(gbam_dent))

	dent = debugfs_create_dir("usb_rmnet", 0);

	if (IS_ERR(dent))

		return;



	dfile = debugfs_create_file("status", 0444, gbam_dent, 0,

			&gbam_stats_ops);

	if (!dfile || IS_ERR(dfile)) {

		debugfs_remove(gbam_dent);

		gbam_dent = NULL;

		return;

	}

}

static void gbam_debugfs_remove(void)

{

	debugfs_remove_recursive(gbam_dent);

	/* TODO: Implement cleanup function to remove created file */

	dfile = debugfs_create_file("status", 0444, dent, 0, &gbam_stats_ops);

	if (!dfile || IS_ERR(dfile))

		debugfs_remove(dent);

}

#else

static inline void gbam_debugfs_init(void) {}

static inline void gbam_debugfs_remove(void) {}

static void gam_debugfs_init(void) { }

#endif



void gbam_disconnect(struct grmnet *gr, u8 port_num, enum transport_type trans)
@@ -1432,6 +1424,7 @@ int gbam_connect(struct grmnet *gr, u8 port_num, 


	d->trans = trans;

	queue_work(gbam_wq, &port->connect_w);



	return 0;

}
@@ -1476,7 +1469,6 @@ int gbam_setup(unsigned int no_bam_port, unsigned int no_bam2bam_port) 
			goto free_bam_ports;

		}

	}



	gbam_debugfs_init();

	return 0;
@@ -1490,11 +1482,6 @@ free_bam_ports: 
	return ret;

}



void gbam_cleanup(void)

{

	gbam_debugfs_remove();

}



void gbam_suspend(struct grmnet *gr, u8 port_num, enum transport_type trans)

{

	struct gbam_port	*port;