The patch titled
bluetooth: small cleanups
has been added to the -mm tree. Its filename is
bluetooth-small-cleanups.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: bluetooth: small cleanups
From: Pavel Machek <pavel@xxxxxxx>
This cleans up bluetooth a bit, no code changes.
Signed-off-by: Pavel Machek <pavel@xxxxxxx>
Cc: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/bluetooth/hci_ldisc.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff -puN drivers/bluetooth/hci_ldisc.c~bluetooth-small-cleanups drivers/bluetooth/hci_ldisc.c
--- a/drivers/bluetooth/hci_ldisc.c~bluetooth-small-cleanups
+++ a/drivers/bluetooth/hci_ldisc.c
@@ -241,15 +241,11 @@ static int hci_uart_send_frame(struct sk
static void hci_uart_destruct(struct hci_dev *hdev)
{
- struct hci_uart *hu;
-
if (!hdev)
return;
BT_DBG("%s", hdev->name);
-
- hu = (struct hci_uart *) hdev->driver_data;
- kfree(hu);
+ kfree(hdev->driver_data);
}
/* ------ LDISC part ------ */
@@ -272,7 +268,7 @@ static int hci_uart_tty_open(struct tty_
return -EEXIST;
if (!(hu = kzalloc(sizeof(struct hci_uart), GFP_KERNEL))) {
- BT_ERR("Can't allocate controll structure");
+ BT_ERR("Can't allocate control structure");
return -ENFILE;
}
@@ -360,7 +356,7 @@ static void hci_uart_tty_wakeup(struct t
*
* Return Value: None
*/
-static void hci_uart_tty_receive(struct tty_struct *tty, const __u8 *data, char *flags, int count)
+static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *flags, int count)
{
struct hci_uart *hu = (void *)tty->disc_data;
@@ -375,7 +371,8 @@ static void hci_uart_tty_receive(struct
hu->hdev->stat.byte_rx += count;
spin_unlock(&hu->rx_lock);
- if (test_and_clear_bit(TTY_THROTTLED,&tty->flags) && tty->driver->unthrottle)
+ if (test_and_clear_bit(TTY_THROTTLED, &tty->flags) &&
+ tty->driver->unthrottle)
tty->driver->unthrottle(tty);
}
_
Patches currently in -mm which might be from pavel@xxxxxxx are
git-gfs2.patch
libata_resume_fix.patch
git-netdev-all.patch
bluetooth-small-cleanups.patch
swsusp-reorder-memory-allocating-functions.patch
swsusp-fix-alloc_pagedir.patch
device_suspend-resume-may-sleep.patch
fix-typo-in-rtc-kconfig.patch
submittingpatches-cleanups.patch
ibm-acpi-documentation-delete-irrelevant-how-to-compile-external-module.patch
network-block-device-is-mostly-known-as-nbd.patch
thinkpad_ec-new-driver-for-thinkpad-embedded-controller-access.patch
hdaps-use-thinkpad_ec-instead-of-direct-port-access.patch
hdaps-unify-and-cache-hdaps-readouts.patch
hdaps-unify-and-cache-hdaps-readouts-fix.patch
hdaps-correct-readout-and-remove-nonsensical-attributes.patch
hdaps-remember-keyboard-and-mouse-activity.patch
hdaps-limit-hardware-query-rate.patch
hdaps-delay-calibration-to-first-hardware-query.patch
hdaps-add-explicit-hardware-configuration-functions.patch
hdaps-add-explicit-hardware-configuration-functions-fix.patch
hdaps-add-new-sysfs-attributes.patch
hdaps-power-off-accelerometer-on-suspend-and-unload.patch
hdaps-stop-polling-timer-when-suspended.patch
hdaps-simplify-whitelist.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
