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

Commit d129f188 authored by Pavel Machek's avatar Pavel Machek Committed by David S. Miller
Browse files

hci_usb: remove code obfuscation 



_urb_free is an alias for kfree... making code longer & harder to
read. Remove it.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b132fba1

drivers/bluetooth/hci_usb.c

+5 −5
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int hci_usb_intr_rx_submit(struct hci_usb *husb) 
		BT_ERR("%s intr rx submit failed urb %p err %d",

				husb->hdev->name, urb, err);

		_urb_unlink(_urb);

		_urb_free(_urb);

		kfree(_urb);

		kfree(buf);

	}

	return err;
@@ -302,7 +302,7 @@ static int hci_usb_bulk_rx_submit(struct hci_usb *husb) 
		BT_ERR("%s bulk rx submit failed urb %p err %d",

				husb->hdev->name, urb, err);

		_urb_unlink(_urb);

		_urb_free(_urb);

		kfree(_urb);

		kfree(buf);

	}

	return err;
@@ -353,7 +353,7 @@ static int hci_usb_isoc_rx_submit(struct hci_usb *husb) 
		BT_ERR("%s isoc rx submit failed urb %p err %d",

				husb->hdev->name, urb, err);

		_urb_unlink(_urb);

		_urb_free(_urb);

		kfree(_urb);

		kfree(buf);

	}

	return err;
@@ -431,7 +431,7 @@ static void hci_usb_unlink_urbs(struct hci_usb *husb) 
					husb->hdev->name, _urb, _urb->type, urb);

			kfree(urb->setup_packet);

			kfree(urb->transfer_buffer);

			_urb_free(_urb);

			kfree(_urb);

		}

	}

}
@@ -490,7 +490,7 @@ static inline int hci_usb_send_ctrl(struct hci_usb *husb, struct sk_buff *skb) 


		dr = kmalloc(sizeof(*dr), GFP_ATOMIC);

		if (!dr) {

			_urb_free(_urb);

			kfree(_urb);

			return -ENOMEM;

		}

	} else

drivers/bluetooth/hci_usb.h

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ struct _urb { 
	struct urb        urb;

};



static inline void _urb_free(struct _urb *_urb)

{

	kfree(_urb);

}



static inline void _urb_queue_init(struct _urb_queue *q)

{

	INIT_LIST_HEAD(&q->head);