The patch titled hci_usb: remove code obfuscation has been removed from the -mm tree. Its filename was hci_usb-remove-code-obfuscation.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hci_usb: remove code obfuscation From: Pavel Machek <pavel@xxxxxx> _urb_free is an alias for kfree... making code longer & harder to read. Remove it. Signed-off-by: Pavel Machek <pavel@xxxxxxx> Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx> Cc: Dave Young <hidave.darkstar@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/bluetooth/hci_usb.c | 10 +++++----- drivers/bluetooth/hci_usb.h | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff -puN drivers/bluetooth/hci_usb.c~hci_usb-remove-code-obfuscation drivers/bluetooth/hci_usb.c --- a/drivers/bluetooth/hci_usb.c~hci_usb-remove-code-obfuscation +++ a/drivers/bluetooth/hci_usb.c @@ -265,7 +265,7 @@ static int hci_usb_intr_rx_submit(struct 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 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 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 h 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(stru dr = kmalloc(sizeof(*dr), GFP_ATOMIC); if (!dr) { - _urb_free(_urb); + kfree(_urb); return -ENOMEM; } } else diff -puN drivers/bluetooth/hci_usb.h~hci_usb-remove-code-obfuscation drivers/bluetooth/hci_usb.h --- a/drivers/bluetooth/hci_usb.h~hci_usb-remove-code-obfuscation +++ a/drivers/bluetooth/hci_usb.h @@ -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); _ Patches currently in -mm which might be from pavel@xxxxxx are origin.patch git-acpi.patch s2ram-warn-when-interrupts-should-be-disabled-but-are-not.patch hci_usbh-fix-hard-to-trigger-race.patch mm-page_allocc-remove-hand-coded-get_order.patch pm-gxfb-add-hook-to-pm-console-layer-that-allows-disabling-of-suspend-vt-switch.patch pm-gxfb-add-hook-to-pm-console-layer-that-allows-disabling-of-suspend-vt-switch-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html