usb: gadget: g_fs: Fix compilation warning (aa02f172) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/usb/gadget/f_fs.c

+38 −40

Original line number	Original line	Diff line number	Diff line
	@@ -27,8 +27,6 @@
	/* #define DEBUG */		/* #define DEBUG */
	/* #define VERBOSE_DEBUG */		/* #define VERBOSE_DEBUG */

	#define pr_fmt(fmt) "f_fs: " fmt "\n"

	#include <linux/blkdev.h>		#include <linux/blkdev.h>
	#include <linux/pagemap.h>		#include <linux/pagemap.h>
	#include <asm/unaligned.h>		#include <asm/unaligned.h>
	@@ -46,13 +44,13 @@
	#ifdef VERBOSE_DEBUG		#ifdef VERBOSE_DEBUG
	# define pr_vdebug pr_debug		# define pr_vdebug pr_debug
	# define ffs_dump_mem(prefix, ptr, len) \		# define ffs_dump_mem(prefix, ptr, len) \
	print_hex_dump_bytes("f_fs" prefix ": ", DUMP_PREFIX_NONE, ptr, len)		print_hex_dump_bytes(pr_fmt(prefix ": "), DUMP_PREFIX_NONE, ptr, len)
	#else		#else
	# define pr_vdebug(...) do { } while (0)		# define pr_vdebug(...) do { } while (0)
	# define ffs_dump_mem(prefix, ptr, len) do { } while (0)		# define ffs_dump_mem(prefix, ptr, len) do { } while (0)
	#endif /* VERBOSE_DEBUG */		#endif /* VERBOSE_DEBUG */

	#define ENTER() pr_vdebug("%s()", __func__)		#define ENTER() pr_vdebug("%s()\n", __func__)


	/* The data structure and setup file ****************************************/		/* The data structure and setup file ****************************************/
	@@ -390,12 +388,12 @@ static int __ffs_ep0_queue_wait(struct ffs_data ffs, char data, size_t len)
	static int __ffs_ep0_stall(struct ffs_data *ffs)		static int __ffs_ep0_stall(struct ffs_data *ffs)
	{		{
	if (ffs->ev.can_stall) {		if (ffs->ev.can_stall) {
	pr_vdebug("ep0 stall");		pr_vdebug("ep0 stall\n");
	usb_ep_set_halt(ffs->gadget->ep0);		usb_ep_set_halt(ffs->gadget->ep0);
	ffs->setup_state = FFS_NO_SETUP;		ffs->setup_state = FFS_NO_SETUP;
	return -EL2HLT;		return -EL2HLT;
	} else {		} else {
	pr_debug("bogus ep0 stall!");		pr_debug("bogus ep0 stall!\n");
	return -ESRCH;		return -ESRCH;
	}		}
	}		}
	@@ -436,7 +434,7 @@ static ssize_t ffs_ep0_write(struct file file, const char __user buf,

	/* Handle data */		/* Handle data */
	if (ffs->state == FFS_READ_DESCRIPTORS) {		if (ffs->state == FFS_READ_DESCRIPTORS) {
	pr_info("read descriptors");		pr_info("read descriptors\n");
	ret = __ffs_data_got_descs(ffs, data, len);		ret = __ffs_data_got_descs(ffs, data, len);
	if (unlikely(ret < 0))		if (unlikely(ret < 0))
	break;		break;
	@@ -444,7 +442,7 @@ static ssize_t ffs_ep0_write(struct file file, const char __user buf,
	ffs->state = FFS_READ_STRINGS;		ffs->state = FFS_READ_STRINGS;
	ret = len;		ret = len;
	} else {		} else {
	pr_info("read strings");		pr_info("read strings\n");
	ret = __ffs_data_got_strings(ffs, data, len);		ret = __ffs_data_got_strings(ffs, data, len);
	if (unlikely(ret < 0))		if (unlikely(ret < 0))
	break;		break;
	@@ -1110,7 +1108,7 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data data, char opts)
	/* Value limit */		/* Value limit */
	eq = strchr(opts, '=');		eq = strchr(opts, '=');
	if (unlikely(!eq)) {		if (unlikely(!eq)) {
	pr_err("'=' missing in %s", opts);		pr_err("'=' missing in %s\n", opts);
	return -EINVAL;		return -EINVAL;
	}		}
	*eq = 0;		*eq = 0;
	@@ -1118,7 +1116,7 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data data, char opts)
	/* Parse value */		/* Parse value */
	value = simple_strtoul(eq + 1, &end, 0);		value = simple_strtoul(eq + 1, &end, 0);
	if (unlikely(end != ',' && end != 0)) {		if (unlikely(end != ',' && end != 0)) {
	pr_err("%s: invalid value: %s", opts, eq + 1);		pr_err("%s: invalid value: %s\n", opts, eq + 1);
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -1153,7 +1151,7 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data data, char opts)

	default:		default:
	invalid:		invalid:
	pr_err("%s: invalid option", opts);		pr_err("%s: invalid option\n", opts);
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -1227,9 +1225,9 @@ static int functionfs_init(void)

	ret = register_filesystem(&ffs_fs_type);		ret = register_filesystem(&ffs_fs_type);
	if (likely(!ret))		if (likely(!ret))
	pr_info("file system registered");		pr_info("file system registered\n");
	else		else
	pr_err("failed registering file system (%d)", ret);		pr_err("failed registering file system (%d)\n", ret);

	return ret;		return ret;
	}		}
	@@ -1238,7 +1236,7 @@ static void functionfs_cleanup(void)
	{		{
	ENTER();		ENTER();

	pr_info("unloading");		pr_info("unloading\n");
	unregister_filesystem(&ffs_fs_type);		unregister_filesystem(&ffs_fs_type);
	}		}

	@@ -1268,7 +1266,7 @@ static void ffs_data_put(struct ffs_data *ffs)
	ENTER();		ENTER();

	if (unlikely(atomic_dec_and_test(&ffs->ref))) {		if (unlikely(atomic_dec_and_test(&ffs->ref))) {
	pr_info("%s(): freeing", __func__);		pr_info("%s(): freeing\n", __func__);
	ffs_data_clear(ffs);		ffs_data_clear(ffs);
	BUG_ON(mutex_is_locked(&ffs->mutex) \|\|		BUG_ON(mutex_is_locked(&ffs->mutex) \|\|
	spin_is_locked(&ffs->ev.waitq.lock) \|\|		spin_is_locked(&ffs->ev.waitq.lock) \|\|
	@@ -1588,14 +1586,14 @@ static int __must_check ffs_do_desc(char *data, unsigned len,

	/* At least two bytes are required: length and type */		/* At least two bytes are required: length and type */
	if (len < 2) {		if (len < 2) {
	pr_vdebug("descriptor too short");		pr_vdebug("descriptor too short\n");
	return -EINVAL;		return -EINVAL;
	}		}

	/* If we have at least as many bytes as the descriptor takes? */		/* If we have at least as many bytes as the descriptor takes? */
	length = _ds->bLength;		length = _ds->bLength;
	if (len < length) {		if (len < length) {
	pr_vdebug("descriptor longer then available data");		pr_vdebug("descriptor longer then available data\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -1603,14 +1601,14 @@ static int __must_check ffs_do_desc(char *data, unsigned len,
	#define __entity_check_STRING(val) (val)		#define __entity_check_STRING(val) (val)
	#define __entity_check_ENDPOINT(val) ((val) & USB_ENDPOINT_NUMBER_MASK)		#define __entity_check_ENDPOINT(val) ((val) & USB_ENDPOINT_NUMBER_MASK)
	#define __entity(type, val) do { \		#define __entity(type, val) do { \
	pr_vdebug("entity " #type "(%02x)", (val)); \		pr_vdebug("entity " #type "(%02x)\n", (val)); \
	if (unlikely(!__entity_check_ ##type(val))) { \		if (unlikely(!__entity_check_ ##type(val))) { \
	pr_vdebug("invalid entity's value"); \		pr_vdebug("invalid entity's value\n"); \
	return -EINVAL; \		return -EINVAL; \
	} \		} \
	ret = entity(FFS_ ##type, &val, _ds, priv); \		ret = entity(FFS_ ##type, &val, _ds, priv); \
	if (unlikely(ret < 0)) { \		if (unlikely(ret < 0)) { \
	pr_debug("entity " #type "(%02x); ret = %d", \		pr_debug("entity " #type "(%02x); ret = %d\n", \
	(val), ret); \		(val), ret); \
	return ret; \		return ret; \
	} \		} \
	@@ -1623,13 +1621,13 @@ static int __must_check ffs_do_desc(char *data, unsigned len,
	case USB_DT_STRING:		case USB_DT_STRING:
	case USB_DT_DEVICE_QUALIFIER:		case USB_DT_DEVICE_QUALIFIER:
	/* function can't have any of those */		/* function can't have any of those */
	pr_vdebug("descriptor reserved for gadget: %d",		pr_vdebug("descriptor reserved for gadget: %d\n",
	_ds->bDescriptorType);		_ds->bDescriptorType);
	return -EINVAL;		return -EINVAL;

	case USB_DT_INTERFACE: {		case USB_DT_INTERFACE: {
	struct usb_interface_descriptor ds = (void )_ds;		struct usb_interface_descriptor ds = (void )_ds;
	pr_vdebug("interface descriptor");		pr_vdebug("interface descriptor\n");
	if (length != sizeof *ds)		if (length != sizeof *ds)
	goto inv_length;		goto inv_length;

	@@ -1641,7 +1639,7 @@ static int __must_check ffs_do_desc(char *data, unsigned len,

	case USB_DT_ENDPOINT: {		case USB_DT_ENDPOINT: {
	struct usb_endpoint_descriptor ds = (void )_ds;		struct usb_endpoint_descriptor ds = (void )_ds;
	pr_vdebug("endpoint descriptor");		pr_vdebug("endpoint descriptor\n");
	if (length != USB_DT_ENDPOINT_SIZE &&		if (length != USB_DT_ENDPOINT_SIZE &&
	length != USB_DT_ENDPOINT_AUDIO_SIZE)		length != USB_DT_ENDPOINT_AUDIO_SIZE)
	goto inv_length;		goto inv_length;
	@@ -1656,7 +1654,7 @@ static int __must_check ffs_do_desc(char *data, unsigned len,

	case USB_DT_INTERFACE_ASSOCIATION: {		case USB_DT_INTERFACE_ASSOCIATION: {
	struct usb_interface_assoc_descriptor ds = (void )_ds;		struct usb_interface_assoc_descriptor ds = (void )_ds;
	pr_vdebug("interface association descriptor");		pr_vdebug("interface association descriptor\n");
	if (length != sizeof *ds)		if (length != sizeof *ds)
	goto inv_length;		goto inv_length;
	if (ds->iFunction)		if (ds->iFunction)
	@@ -1670,16 +1668,16 @@ static int __must_check ffs_do_desc(char *data, unsigned len,
	case USB_DT_SECURITY:		case USB_DT_SECURITY:
	case USB_DT_CS_RADIO_CONTROL:		case USB_DT_CS_RADIO_CONTROL:
	/* TODO */		/* TODO */
	pr_vdebug("unimplemented descriptor: %d", _ds->bDescriptorType);		pr_vdebug("unimplemented descriptor: %d\n", _ds->bDescriptorType);
	return -EINVAL;		return -EINVAL;

	default:		default:
	/* We should never be here */		/* We should never be here */
	pr_vdebug("unknown descriptor: %d", _ds->bDescriptorType);		pr_vdebug("unknown descriptor: %d\n", _ds->bDescriptorType);
	return -EINVAL;		return -EINVAL;

	inv_length:		inv_length:
	pr_vdebug("invalid length: %d (descriptor %d)",		pr_vdebug("invalid length: %d (descriptor %d)\n",
	_ds->bLength, _ds->bDescriptorType);		_ds->bLength, _ds->bDescriptorType);
	return -EINVAL;		return -EINVAL;
	}		}
	@@ -1710,7 +1708,7 @@ static int __must_check ffs_do_descs(unsigned count, char *data, unsigned len,
	/* Record "descriptor" entity */		/* Record "descriptor" entity */
	ret = entity(FFS_DESCRIPTOR, (u8 )num, (void )data, priv);		ret = entity(FFS_DESCRIPTOR, (u8 )num, (void )data, priv);
	if (unlikely(ret < 0)) {		if (unlikely(ret < 0)) {
	pr_debug("entity DESCRIPTOR(%02lx); ret = %d",		pr_debug("entity DESCRIPTOR(%02lx); ret = %d\n",
	num, ret);		num, ret);
	return ret;		return ret;
	}		}
	@@ -1720,7 +1718,7 @@ static int __must_check ffs_do_descs(unsigned count, char *data, unsigned len,

	ret = ffs_do_desc(data, len, entity, priv);		ret = ffs_do_desc(data, len, entity, priv);
	if (unlikely(ret < 0)) {		if (unlikely(ret < 0)) {
	pr_debug("%s returns %d", __func__, ret);		pr_debug("%s returns %d\n", __func__, ret);
	return ret;		return ret;
	}		}

	@@ -2013,11 +2011,11 @@ static void __ffs_event_add(struct ffs_data *ffs,
	if ((ev == rem_type1 \|\| ev == rem_type2) == neg)		if ((ev == rem_type1 \|\| ev == rem_type2) == neg)
	out++ = ev;		out++ = ev;
	else		else
	pr_vdebug("purging event %d", *ev);		pr_vdebug("purging event %d\n", *ev);
	ffs->ev.count = out - ffs->ev.types;		ffs->ev.count = out - ffs->ev.types;
	}		}

	pr_vdebug("adding event %d", type);		pr_vdebug("adding event %d\n", type);
	ffs->ev.types[ffs->ev.count++] = type;		ffs->ev.types[ffs->ev.count++] = type;
	wake_up_locked(&ffs->ev.waitq);		wake_up_locked(&ffs->ev.waitq);
	}		}
	@@ -2064,7 +2062,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep,
	ffs_ep = func->eps + idx;		ffs_ep = func->eps + idx;

	if (unlikely(ffs_ep->descs[isHS])) {		if (unlikely(ffs_ep->descs[isHS])) {
	pr_vdebug("two %sspeed descriptors for EP %d",		pr_vdebug("two %sspeed descriptors for EP %d\n",
	isHS ? "high" : "full",		isHS ? "high" : "full",
	ds->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);		ds->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
	return -EINVAL;		return -EINVAL;
	@@ -2080,7 +2078,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep,
	struct usb_request *req;		struct usb_request *req;
	struct usb_ep *ep;		struct usb_ep *ep;

	pr_vdebug("autoconfig");		pr_vdebug("autoconfig\n");
	ep = usb_ep_autoconfig(func->gadget, ds);		ep = usb_ep_autoconfig(func->gadget, ds);
	if (unlikely(!ep))		if (unlikely(!ep))
	return -ENOTSUPP;		return -ENOTSUPP;
	@@ -2150,7 +2148,7 @@ static int __ffs_func_bind_do_nums(enum ffs_entity_type type, u8 *valuep,
	break;		break;
	}		}

	pr_vdebug("%02x -> %02x", *valuep, newValue);		pr_vdebug("%02x -> %02x\n", *valuep, newValue);
	*valuep = newValue;		*valuep = newValue;
	return 0;		return 0;
	}		}
	@@ -2315,11 +2313,11 @@ static int ffs_func_setup(struct usb_function *f,

	ENTER();		ENTER();

	pr_vdebug("creq->bRequestType = %02x", creq->bRequestType);		pr_vdebug("creq->bRequestType = %02x\n", creq->bRequestType);
	pr_vdebug("creq->bRequest = %02x", creq->bRequest);		pr_vdebug("creq->bRequest = %02x\n", creq->bRequest);
	pr_vdebug("creq->wValue = %04x", le16_to_cpu(creq->wValue));		pr_vdebug("creq->wValue = %04x\n", le16_to_cpu(creq->wValue));
	pr_vdebug("creq->wIndex = %04x", le16_to_cpu(creq->wIndex));		pr_vdebug("creq->wIndex = %04x\n", le16_to_cpu(creq->wIndex));
	pr_vdebug("creq->wLength = %04x", le16_to_cpu(creq->wLength));		pr_vdebug("creq->wLength = %04x\n", le16_to_cpu(creq->wLength));

	/*		/*
	* Most requests directed to interface go through here		* Most requests directed to interface go through here
	@@ -2419,7 +2417,7 @@ static char ffs_prepare_buffer(const char __user buf, size_t len)
	return ERR_PTR(-EFAULT);		return ERR_PTR(-EFAULT);
	}		}

	pr_vdebug("Buffer from user space:");		pr_vdebug("Buffer from user space:\n");
	ffs_dump_mem("", data, len);		ffs_dump_mem("", data, len);

	return data;		return data;

drivers/usb/gadget/g_ffs.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,8 @@
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*/		*/

			#define pr_fmt(fmt) "g_ffs: " fmt

	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/utsname.h>		#include <linux/utsname.h>