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

Commit 7039f422 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: kzalloc() conversion in drivers/usb/gadget 



this patch converts drivers/usb to kzalloc usage.
Compile tested with allyes config.

I think there was a bug in drivers/usb/gadget/inode.c because
it used sizeof(*data) for the kmalloc() and sizeof(data) for
the memset(), since sizeof(data) just returns the size for a pointer.

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 80b6ca48

drivers/usb/gadget/dummy_hcd.c

+1 −2
Original line number Diff line number Diff line
@@ -478,10 +478,9 @@ dummy_alloc_request (struct usb_ep *_ep, gfp_t mem_flags) 
		return NULL;

	ep = usb_ep_to_dummy_ep (_ep);



	req = kmalloc (sizeof *req, mem_flags);

	req = kzalloc(sizeof(*req), mem_flags);

	if (!req)

		return NULL;

	memset (req, 0, sizeof *req);

	INIT_LIST_HEAD (&req->queue);

	return &req->req;

}

drivers/usb/gadget/goku_udc.c

+1 −2
Original line number Diff line number Diff line
@@ -275,11 +275,10 @@ goku_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags) 


	if (!_ep)

		return NULL;

	req = kmalloc(sizeof *req, gfp_flags);

	req = kzalloc(sizeof *req, gfp_flags);

	if (!req)

		return NULL;



	memset(req, 0, sizeof *req);

	req->req.dma = DMA_ADDR_INVALID;

	INIT_LIST_HEAD(&req->queue);

	return &req->req;

drivers/usb/gadget/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -170,10 +170,9 @@ static struct dev_data *dev_new (void) 
{

	struct dev_data		*dev;



	dev = kmalloc (sizeof *dev, GFP_KERNEL);

	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;

	memset (dev, 0, sizeof *dev);

	dev->state = STATE_DEV_DISABLED;

	atomic_set (&dev->count, 1);

	spin_lock_init (&dev->lock);
@@ -1592,10 +1591,9 @@ static int activate_ep_files (struct dev_data *dev) 
	gadget_for_each_ep (ep, dev->gadget) {

		struct ep_data	*data;



		data = kmalloc (sizeof *data, GFP_KERNEL);

		data = kzalloc(sizeof(*data), GFP_KERNEL);

		if (!data)

			goto enomem;

		memset (data, 0, sizeof data);

		data->state = STATE_EP_DISABLED;

		init_MUTEX (&data->lock);

		init_waitqueue_head (&data->wait);

drivers/usb/gadget/lh7a40x_udc.c

+1 −2
Original line number Diff line number Diff line
@@ -1114,11 +1114,10 @@ static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, 


	DEBUG("%s, %p\n", __FUNCTION__, ep);



	req = kmalloc(sizeof *req, gfp_flags);

	req = kzalloc(sizeof(*req), gfp_flags);

	if (!req)

		return 0;



	memset(req, 0, sizeof *req);

	INIT_LIST_HEAD(&req->queue);



	return &req->req;

drivers/usb/gadget/net2280.c

+1 −2
Original line number Diff line number Diff line
@@ -386,11 +386,10 @@ net2280_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags) 
		return NULL;

	ep = container_of (_ep, struct net2280_ep, ep);



	req = kmalloc (sizeof *req, gfp_flags);

	req = kzalloc(sizeof(*req), gfp_flags);

	if (!req)

		return NULL;



	memset (req, 0, sizeof *req);

	req->req.dma = DMA_ADDR_INVALID;

	INIT_LIST_HEAD (&req->queue);