linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Herrmann <dh.herrmann@googlemail.com>
To: linux-bluetooth@vger.kernel.org
Cc: padovan@profusion.mobi, marcel@holtmann.org,
	David Herrmann <dh.herrmann@googlemail.com>
Subject: [PATCH 14/18] Bluetooth: Remove unused hci-destruct cb
Date: Sat,  7 Jan 2012 15:47:20 +0100	[thread overview]
Message-ID: <1325947644-11736-15-git-send-email-dh.herrmann@googlemail.com> (raw)
In-Reply-To: <1325947644-11736-1-git-send-email-dh.herrmann@googlemail.com>

The hci-destruct callback is not used by any driver so we can remove it. There
is no reason to keep it alive, anymore. Drivers can free their internal data on
driver-release and we do not need to provide a public destruct callback.

Internally, we still use a destruct callback inside of hci_sysfs.c. This one is
used to correctly free our hci_dev data structure if no more users have a
reference to it.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
---
 include/net/bluetooth/hci_core.h |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index b2c23e6..ab97ad3 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -254,7 +254,6 @@ struct hci_dev {
 	int (*close)(struct hci_dev *hdev);
 	int (*flush)(struct hci_dev *hdev);
 	int (*send)(struct sk_buff *skb);
-	void (*destruct)(struct hci_dev *hdev);
 	void (*notify)(struct hci_dev *hdev, unsigned int evt);
 	int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);
 };
@@ -568,10 +567,7 @@ static inline void hci_conn_put(struct hci_conn *conn)
 /* ----- HCI Devices ----- */
 static inline void __hci_dev_put(struct hci_dev *d)
 {
-	if (atomic_dec_and_test(&d->refcnt)) {
-		if (d->destruct)
-			d->destruct(d);
-	}
+	atomic_dec(&d->refcnt);
 }
 
 /*
-- 
1.7.8.1

  parent reply	other threads:[~2012-01-07 14:47 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-07 14:47 [PATCH 00/18] Cleanup HCI reference counts David Herrmann
2012-01-07 14:47 ` [PATCH 01/18] Bluetooth: Make hci-destruct callback optional David Herrmann
2012-01-07 14:47 ` [PATCH 02/18] Bluetooth: bluecard-cs: Remove empty destruct cb David Herrmann
2012-01-07 14:47 ` [PATCH 03/18] Bluetooth: bt3c-cs: " David Herrmann
2012-01-07 14:47 ` [PATCH 04/18] Bluetooth: btmrvl: " David Herrmann
2012-01-07 14:47 ` [PATCH 05/18] Bluetooth: btuart-cs: " David Herrmann
2012-01-07 14:47 ` [PATCH 06/18] Bluetooth: btwilink: " David Herrmann
2012-01-07 14:47 ` [PATCH 07/18] Bluetooth: dtl1-cs: " David Herrmann
2012-01-07 14:47 ` [PATCH 08/18] Bluetooth: vhci: Free driver_data on file release David Herrmann
2012-01-07 14:47 ` [PATCH 09/18] Bluetooth: bfusb: Free driver_data on USB shutdown David Herrmann
2012-01-07 14:47 ` [PATCH 10/18] Bluetooth: btusb: Free driver data " David Herrmann
2012-01-07 14:47 ` [PATCH 11/18] Bluetooth: bpa10x: Free private driver data on usb shutdown David Herrmann
2012-01-07 14:47 ` [PATCH 12/18] Bluetooth: btsdio: Free driver data on SDIO shutdown David Herrmann
2012-01-07 14:47 ` [PATCH 13/18] Bluetooth: uart-ldisc: Fix memory leak and remove destruct cb David Herrmann
2012-01-07 14:47 ` David Herrmann [this message]
2012-01-07 14:47 ` [PATCH 15/18] Bluetooth: Correctly acquire module ref David Herrmann
2012-01-07 14:47 ` [PATCH 16/18] Bluetooth: Remove HCI-owner field David Herrmann
2012-01-07 14:47 ` [PATCH 17/18] Bluetooth: Correctly take hci_dev->dev refcount David Herrmann
2012-01-07 14:47 ` [PATCH 18/18] Bluetooth: Remove __hci_dev_put/hold David Herrmann
2012-01-09  7:54 ` [PATCH 00/18] Cleanup HCI reference counts Marcel Holtmann
2012-01-09 11:44 ` Johan Hedberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1325947644-11736-15-git-send-email-dh.herrmann@googlemail.com \
    --to=dh.herrmann@googlemail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=marcel@holtmann.org \
    --cc=padovan@profusion.mobi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).