Commit 2c95e6c7 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by David S. Miller
Browse files

nfc: mrvl: reduce the scope of local variables 



In two places the 'ep_desc' and 'skb' local variables are used only
within if() or for() block, so they scope can be reduced which makes the
entire code slightly easier to follow.  No functional change.

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5822404

drivers/nfc/nfcmrvl/usb.c

+4 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ static int nfcmrvl_inc_tx(struct nfcmrvl_usb_drv_data *drv_data) 
static void nfcmrvl_bulk_complete(struct urb *urb)

{

	struct nfcmrvl_usb_drv_data *drv_data = urb->context;

	struct sk_buff *skb;

	int err;



	dev_dbg(&drv_data->udev->dev, "urb %p status %d count %d\n",
@@ -67,6 +66,8 @@ static void nfcmrvl_bulk_complete(struct urb *urb) 
		return;



	if (!urb->status) {

		struct sk_buff *skb;



		skb = nci_skb_alloc(drv_data->priv->ndev, urb->actual_length,

				    GFP_ATOMIC);

		if (!skb) {
@@ -285,7 +286,6 @@ static void nfcmrvl_waker(struct work_struct *work) 
static int nfcmrvl_probe(struct usb_interface *intf,

			 const struct usb_device_id *id)

{

	struct usb_endpoint_descriptor *ep_desc;

	struct nfcmrvl_usb_drv_data *drv_data;

	struct nfcmrvl_private *priv;

	int i;
@@ -303,6 +303,8 @@ static int nfcmrvl_probe(struct usb_interface *intf, 
		return -ENOMEM;



	for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; i++) {

		struct usb_endpoint_descriptor *ep_desc;



		ep_desc = &intf->cur_altsetting->endpoint[i].desc;



		if (!drv_data->bulk_tx_ep &&