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

Commit 74ad8fda authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: bluecard_cs: Shorten scope for iobase 



Shortening scope shall silence some warnings reported by Geert
Uytterhoeven:

...
drivers/bluetooth/bluecard_cs.c: warning: unused variable 'iobase'
	[-Wunused-variable]
...

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent d300fa9b

drivers/bluetooth/bluecard_cs.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -621,7 +621,6 @@ static int bluecard_hci_flush(struct hci_dev *hdev) 
static int bluecard_hci_open(struct hci_dev *hdev)

static int bluecard_hci_open(struct hci_dev *hdev)

{

{

	bluecard_info_t *info = hci_get_drvdata(hdev);

	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)))

	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state)))

		bluecard_hci_set_baud_rate(hdev, DEFAULT_BAUD_RATE);

		bluecard_hci_set_baud_rate(hdev, DEFAULT_BAUD_RATE);
@@ -630,6 +629,8 @@ static int bluecard_hci_open(struct hci_dev *hdev) 
		return 0;

		return 0;





	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {

	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {

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



		/* Enable LED */

		/* Enable LED */

		outb(0x08 | 0x20, iobase + 0x30);

		outb(0x08 | 0x20, iobase + 0x30);

	}

	}
@@ -641,7 +642,6 @@ static int bluecard_hci_open(struct hci_dev *hdev) 
static int bluecard_hci_close(struct hci_dev *hdev)

static int bluecard_hci_close(struct hci_dev *hdev)

{

{

	bluecard_info_t *info = hci_get_drvdata(hdev);

	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)))

	if (!test_and_clear_bit(HCI_RUNNING, &(hdev->flags)))

		return 0;

		return 0;
@@ -649,6 +649,8 @@ static int bluecard_hci_close(struct hci_dev *hdev) 
	bluecard_hci_flush(hdev);

	bluecard_hci_flush(hdev);





	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {

	if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) {

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



		/* Disable LED */

		/* Disable LED */

		outb(0x00, iobase + 0x30);

		outb(0x00, iobase + 0x30);

	}

	}