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

Commit 155961e8 authored by David Herrmann's avatar David Herrmann Committed by Johan Hedberg
Browse files

Bluetooth: Remove hci_dev->driver_data 



The linux device model provides dev_set/get_drvdata so we can use this
to save private driver data.
This also removes several unnecessary casts.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@googlemail.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent aa2b86d7

drivers/bluetooth/bfusb.c

+5 −5
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static void bfusb_rx_complete(struct urb *urb) 


static int bfusb_open(struct hci_dev *hdev)

{

	struct bfusb_data *data = hdev->driver_data;

	struct bfusb_data *data = hci_get_drvdata(hdev);

	unsigned long flags;

	int i, err;
@@ -437,7 +437,7 @@ static int bfusb_open(struct hci_dev *hdev) 


static int bfusb_flush(struct hci_dev *hdev)

{

	struct bfusb_data *data = hdev->driver_data;

	struct bfusb_data *data = hci_get_drvdata(hdev);



	BT_DBG("hdev %p bfusb %p", hdev, data);
@@ -448,7 +448,7 @@ static int bfusb_flush(struct hci_dev *hdev) 


static int bfusb_close(struct hci_dev *hdev)

{

	struct bfusb_data *data = hdev->driver_data;

	struct bfusb_data *data = hci_get_drvdata(hdev);

	unsigned long flags;



	BT_DBG("hdev %p bfusb %p", hdev, data);
@@ -483,7 +483,7 @@ static int bfusb_send_frame(struct sk_buff *skb) 
	if (!test_bit(HCI_RUNNING, &hdev->flags))

		return -EBUSY;



	data = hdev->driver_data;

	data = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:
@@ -696,7 +696,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	data->hdev = hdev;



	hdev->bus = HCI_USB;

	hdev->driver_data = data;

	hci_set_drvdata(hdev, data);

	SET_HCIDEV_DEV(hdev, &intf->dev);



	hdev->open     = bfusb_open;

drivers/bluetooth/bluecard_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst) 


static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)

{

	bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);

	bluecard_info_t *info = hci_get_drvdata(hdev);

	struct sk_buff *skb;



	/* Ericsson baud rate command */
@@ -609,7 +609,7 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud) 


static int bluecard_hci_flush(struct hci_dev *hdev)

{

	bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);

	bluecard_info_t *info = hci_get_drvdata(hdev);



	/* Drop TX queue */

	skb_queue_purge(&(info->txq));
@@ -620,7 +620,7 @@ static int bluecard_hci_flush(struct hci_dev *hdev) 


static int bluecard_hci_open(struct hci_dev *hdev)

{

	bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);

	bluecard_info_t *info = hci_get_drvdata(hdev);

	unsigned int iobase = info->p_dev->resource[0]->start;



	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state)))
@@ -640,7 +640,7 @@ static int bluecard_hci_open(struct hci_dev *hdev) 


static int bluecard_hci_close(struct hci_dev *hdev)

{

	bluecard_info_t *info = (bluecard_info_t *)(hdev->driver_data);

	bluecard_info_t *info = hci_get_drvdata(hdev);

	unsigned int iobase = info->p_dev->resource[0]->start;



	if (!test_and_clear_bit(HCI_RUNNING, &(hdev->flags)))
@@ -667,7 +667,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb) 
		return -ENODEV;

	}



	info = (bluecard_info_t *)(hdev->driver_data);

	info = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:
@@ -729,7 +729,7 @@ static int bluecard_open(bluecard_info_t *info) 
	info->hdev = hdev;



	hdev->bus = HCI_PCCARD;

	hdev->driver_data = info;

	hci_set_drvdata(hdev, info);

	SET_HCIDEV_DEV(hdev, &info->p_dev->dev);



	hdev->open     = bluecard_hci_open;

drivers/bluetooth/bpa10x.c

+9 −9
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct hci_vendor_hdr { 


static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count)

{

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);



	BT_DBG("%s queue %d buffer %p count %d", hdev->name,

							queue, buf, count);
@@ -189,7 +189,7 @@ static void bpa10x_tx_complete(struct urb *urb) 
static void bpa10x_rx_complete(struct urb *urb)

{

	struct hci_dev *hdev = urb->context;

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);

	int err;



	BT_DBG("%s urb %p status %d count %d", hdev->name,
@@ -219,7 +219,7 @@ static void bpa10x_rx_complete(struct urb *urb) 


static inline int bpa10x_submit_intr_urb(struct hci_dev *hdev)

{

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);

	struct urb *urb;

	unsigned char *buf;

	unsigned int pipe;
@@ -260,7 +260,7 @@ static inline int bpa10x_submit_intr_urb(struct hci_dev *hdev) 


static inline int bpa10x_submit_bulk_urb(struct hci_dev *hdev)

{

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);

	struct urb *urb;

	unsigned char *buf;

	unsigned int pipe;
@@ -301,7 +301,7 @@ static inline int bpa10x_submit_bulk_urb(struct hci_dev *hdev) 


static int bpa10x_open(struct hci_dev *hdev)

{

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);

	int err;



	BT_DBG("%s", hdev->name);
@@ -329,7 +329,7 @@ static int bpa10x_open(struct hci_dev *hdev) 


static int bpa10x_close(struct hci_dev *hdev)

{

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);



	BT_DBG("%s", hdev->name);
@@ -343,7 +343,7 @@ static int bpa10x_close(struct hci_dev *hdev) 


static int bpa10x_flush(struct hci_dev *hdev)

{

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);



	BT_DBG("%s", hdev->name);
@@ -355,7 +355,7 @@ static int bpa10x_flush(struct hci_dev *hdev) 
static int bpa10x_send_frame(struct sk_buff *skb)

{

	struct hci_dev *hdev = (struct hci_dev *) skb->dev;

	struct bpa10x_data *data = hdev->driver_data;

	struct bpa10x_data *data = hci_get_drvdata(hdev);

	struct usb_ctrlrequest *dr;

	struct urb *urb;

	unsigned int pipe;
@@ -459,7 +459,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * 
	}



	hdev->bus = HCI_USB;

	hdev->driver_data = data;

	hci_set_drvdata(hdev, data);



	data->hdev = hdev;

drivers/bluetooth/bt3c_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst) 


static int bt3c_hci_flush(struct hci_dev *hdev)

{

	bt3c_info_t *info = (bt3c_info_t *)(hdev->driver_data);

	bt3c_info_t *info = hci_get_drvdata(hdev);



	/* Drop TX queue */

	skb_queue_purge(&(info->txq));
@@ -428,7 +428,7 @@ static int bt3c_hci_send_frame(struct sk_buff *skb) 
		return -ENODEV;

	}



	info = (bt3c_info_t *) (hdev->driver_data);

	info = hci_get_drvdata(hdev);



	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:
@@ -575,7 +575,7 @@ static int bt3c_open(bt3c_info_t *info) 
	info->hdev = hdev;



	hdev->bus = HCI_PCCARD;

	hdev->driver_data = info;

	hci_set_drvdata(hdev, info);

	SET_HCIDEV_DEV(hdev, &info->p_dev->dev);



	hdev->open     = bt3c_hci_open;

drivers/bluetooth/btmrvl_debugfs.c

+12 −14
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static const struct file_operations btmrvl_txdnldready_fops = { 


void btmrvl_debugfs_init(struct hci_dev *hdev)

{

	struct btmrvl_private *priv = hdev->driver_data;

	struct btmrvl_private *priv = hci_get_drvdata(hdev);

	struct btmrvl_debugfs_data *dbg;



	if (!hdev->debugfs)
@@ -401,36 +401,34 @@ void btmrvl_debugfs_init(struct hci_dev *hdev) 
	dbg->config_dir = debugfs_create_dir("config", hdev->debugfs);



	dbg->psmode = debugfs_create_file("psmode", 0644, dbg->config_dir,

				hdev->driver_data, &btmrvl_psmode_fops);

				priv, &btmrvl_psmode_fops);

	dbg->pscmd = debugfs_create_file("pscmd", 0644, dbg->config_dir,

				hdev->driver_data, &btmrvl_pscmd_fops);

				priv, &btmrvl_pscmd_fops);

	dbg->gpiogap = debugfs_create_file("gpiogap", 0644, dbg->config_dir,

				hdev->driver_data, &btmrvl_gpiogap_fops);

				priv, &btmrvl_gpiogap_fops);

	dbg->hsmode =  debugfs_create_file("hsmode", 0644, dbg->config_dir,

				hdev->driver_data, &btmrvl_hsmode_fops);

				priv, &btmrvl_hsmode_fops);

	dbg->hscmd = debugfs_create_file("hscmd", 0644, dbg->config_dir,

				hdev->driver_data, &btmrvl_hscmd_fops);

				priv, &btmrvl_hscmd_fops);

	dbg->hscfgcmd = debugfs_create_file("hscfgcmd", 0644, dbg->config_dir,

				hdev->driver_data, &btmrvl_hscfgcmd_fops);

				priv, &btmrvl_hscfgcmd_fops);



	dbg->status_dir = debugfs_create_dir("status", hdev->debugfs);

	dbg->curpsmode = debugfs_create_file("curpsmode", 0444,

						dbg->status_dir,

						hdev->driver_data,

						&btmrvl_curpsmode_fops);

				dbg->status_dir, priv, &btmrvl_curpsmode_fops);

	dbg->psstate = debugfs_create_file("psstate", 0444, dbg->status_dir,

				hdev->driver_data, &btmrvl_psstate_fops);

				priv, &btmrvl_psstate_fops);

	dbg->hsstate = debugfs_create_file("hsstate", 0444, dbg->status_dir,

				hdev->driver_data, &btmrvl_hsstate_fops);

				priv, &btmrvl_hsstate_fops);

	dbg->txdnldready = debugfs_create_file("txdnldready", 0444,

						dbg->status_dir,

						hdev->driver_data,

						priv,

						&btmrvl_txdnldready_fops);

}



void btmrvl_debugfs_remove(struct hci_dev *hdev)

{

	struct btmrvl_private *priv = hdev->driver_data;

	struct btmrvl_private *priv = hci_get_drvdata(hdev);

	struct btmrvl_debugfs_data *dbg = priv->debugfs_data;



	if (!dbg)