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

Commit eba7cc0e authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: rndis_ipa: fix to debug file system init failure" into msm-4.9

parents 23bfccd1 db9087ea

drivers/net/ethernet/msm/ecm_ipa.c

+16 −10
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static ssize_t ecm_ipa_debugfs_enable_read 
	(struct file *file, char __user *ubuf, size_t count, loff_t *ppos);

static ssize_t ecm_ipa_debugfs_atomic_read

	(struct file *file, char __user *ubuf, size_t count, loff_t *ppos);

static int ecm_ipa_debugfs_init(struct ecm_ipa_dev *ecm_ipa_ctx);

static void ecm_ipa_debugfs_init(struct ecm_ipa_dev *ecm_ipa_ctx);

static void ecm_ipa_debugfs_destroy(struct ecm_ipa_dev *ecm_ipa_ctx);

static int ecm_ipa_ep_registers_cfg(u32 usb_to_ipa_hdl, u32 ipa_to_usb_hdl);

static int ecm_ipa_set_device_ethernet_addr
@@ -269,10 +269,7 @@ int ecm_ipa_init(struct ecm_ipa_params *params) 
		ECM_IPA_DEBUG("device_ready_notify() was not supplied");

	ecm_ipa_ctx->device_ready_notify = params->device_ready_notify;



	result = ecm_ipa_debugfs_init(ecm_ipa_ctx);

	if (result)

		goto fail_debugfs;

	ECM_IPA_DEBUG("debugfs entries were created\n");

	ecm_ipa_debugfs_init(ecm_ipa_ctx);



	result = ecm_ipa_set_device_ethernet_addr

		(net->dev_addr, params->device_ethaddr);
@@ -321,7 +318,6 @@ int ecm_ipa_init(struct ecm_ipa_params *params) 
fail_set_device_ethernet:

fail_rules_cfg:

	ecm_ipa_debugfs_destroy(ecm_ipa_ctx);

fail_debugfs:

fail_netdev_priv:

	free_netdev(net);

fail_alloc_etherdev:
@@ -1232,7 +1228,9 @@ static ssize_t ecm_ipa_debugfs_atomic_read 
	return simple_read_from_buffer(ubuf, count, ppos, atomic_str, nbytes);

}



static int ecm_ipa_debugfs_init(struct ecm_ipa_dev *ecm_ipa_ctx)

#ifdef CONFIG_DEBUG_FS



static void ecm_ipa_debugfs_init(struct ecm_ipa_dev *ecm_ipa_ctx)

{

	const mode_t flags_read_write = 0666;

	const mode_t flags_read_only = 0444;
@@ -1241,7 +1239,7 @@ static int ecm_ipa_debugfs_init(struct ecm_ipa_dev *ecm_ipa_ctx) 
	ECM_IPA_LOG_ENTRY();



	if (!ecm_ipa_ctx)

		return -EINVAL;

		return;



	ecm_ipa_ctx->directory = debugfs_create_dir("ecm_ipa", NULL);

	if (!ecm_ipa_ctx->directory) {
@@ -1274,11 +1272,11 @@ static int ecm_ipa_debugfs_init(struct ecm_ipa_dev *ecm_ipa_ctx) 
	ECM_IPA_DEBUG("debugfs entries were created\n");

	ECM_IPA_LOG_EXIT();



	return 0;

	return;

fail_file:

	debugfs_remove_recursive(ecm_ipa_ctx->directory);

fail_directory:

	return -EFAULT;

	return;

}



static void ecm_ipa_debugfs_destroy(struct ecm_ipa_dev *ecm_ipa_ctx)
@@ -1286,6 +1284,14 @@ static void ecm_ipa_debugfs_destroy(struct ecm_ipa_dev *ecm_ipa_ctx) 
	debugfs_remove_recursive(ecm_ipa_ctx->directory);

}



#else /* !CONFIG_DEBUG_FS*/



static void ecm_ipa_debugfs_init(struct ecm_ipa_dev *ecm_ipa_ctx) {}



static void ecm_ipa_debugfs_destroy(struct ecm_ipa_dev *ecm_ipa_ctx) {}



#endif /* CONFIG_DEBUG_FS */



/**

 * ecm_ipa_ep_cfg() - configure the USB endpoints for ECM

 *

drivers/net/ethernet/msm/rndis_ipa.c

+18 −12
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static ssize_t rndis_ipa_debugfs_atomic_read 
	(struct file *file,

	char __user *ubuf, size_t count, loff_t *ppos);

static void rndis_ipa_dump_skb(struct sk_buff *skb);

static int rndis_ipa_debugfs_init(struct rndis_ipa_dev *rndis_ipa_ctx);

static void rndis_ipa_debugfs_init(struct rndis_ipa_dev *rndis_ipa_ctx);

static void rndis_ipa_debugfs_destroy(struct rndis_ipa_dev *rndis_ipa_ctx);

static int rndis_ipa_ep_registers_cfg

	(u32 usb_to_ipa_hdl,
@@ -551,10 +551,7 @@ int rndis_ipa_init(struct ipa_usb_init_params *params) 
		("Needed headroom for RNDIS header set to %d\n",

		net->needed_headroom);



	result = rndis_ipa_debugfs_init(rndis_ipa_ctx);

	if (result)

		goto fail_debugfs;

	RNDIS_IPA_DEBUG("debugfs entries were created\n");

	rndis_ipa_debugfs_init(rndis_ipa_ctx);



	result = rndis_ipa_set_device_ethernet_addr

		(net->dev_addr, rndis_ipa_ctx->device_ethaddr);
@@ -613,7 +610,6 @@ int rndis_ipa_init(struct ipa_usb_init_params *params) 
fail_set_device_ethernet:

fail_hdrs_cfg:

	rndis_ipa_debugfs_destroy(rndis_ipa_ctx);

fail_debugfs:

fail_netdev_priv:

	free_netdev(net);

fail_alloc_etherdev:
@@ -2175,10 +2171,11 @@ static void rndis_ipa_dump_skb(struct sk_buff *skb) 
		("packet dump ended for skb->len=%d\n", skb->len);

}



#ifdef CONFIG_DEBUG_FS

/**

 * Creates the root folder for the driver

 */

static int rndis_ipa_debugfs_init(struct rndis_ipa_dev *rndis_ipa_ctx)

static void rndis_ipa_debugfs_init(struct rndis_ipa_dev *rndis_ipa_ctx)

{

	const mode_t flags_read_write = 0666;

	const mode_t flags_read_only = 0444;
@@ -2189,7 +2186,7 @@ static int rndis_ipa_debugfs_init(struct rndis_ipa_dev *rndis_ipa_ctx) 
	RNDIS_IPA_LOG_ENTRY();



	if (!rndis_ipa_ctx)

		return -EINVAL;

		return;



	rndis_ipa_ctx->directory = debugfs_create_dir(DEBUGFS_DIR_NAME, NULL);

	if (!rndis_ipa_ctx->directory) {
@@ -2385,13 +2382,14 @@ static int rndis_ipa_debugfs_init(struct rndis_ipa_dev *rndis_ipa_ctx) 
		goto fail_file;

	}



	RNDIS_IPA_DEBUG("debugfs entries were created\n");

	RNDIS_IPA_LOG_EXIT();



	return 0;

	return;

fail_file:

	debugfs_remove_recursive(rndis_ipa_ctx->directory);

fail_directory:

	return -EFAULT;

	return;

}



static void rndis_ipa_debugfs_destroy(struct rndis_ipa_dev *rndis_ipa_ctx)
@@ -2399,6 +2397,14 @@ static void rndis_ipa_debugfs_destroy(struct rndis_ipa_dev *rndis_ipa_ctx) 
	debugfs_remove_recursive(rndis_ipa_ctx->directory);

}



#else /* !CONFIG_DEBUG_FS */



static void rndis_ipa_debugfs_init(struct rndis_ipa_dev *rndis_ipa_ctx) {}



static void rndis_ipa_debugfs_destroy(struct rndis_ipa_dev *rndis_ipa_ctx) {}



#endif /* CONFIG_DEBUG_FS*/



static int rndis_ipa_debugfs_aggr_open

		(struct inode *inode,

		struct file *file)