aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-09-14 11:57:53 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2016-10-08 09:02:19 +0300
commita1c2bbc87b227dbf8e00b9684544eff9c861fcf7 (patch)
tree9754dd649fadd25287e3a978f13e74e23e24a004
parente69f7d2510ab93ed4828ed69452f9c7c84f3f33a (diff)
bt-hci-csr: drop unused argument
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--hw/arm/nseries.c3
-rw-r--r--hw/bt/hci-csr.c2
-rw-r--r--include/hw/bt.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index fea911e3e3..c86cf80514 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -786,8 +786,7 @@ static void n8x0_cbus_setup(struct n800_s *s)
static void n8x0_uart_setup(struct n800_s *s)
{
- CharDriverState *radio = uart_hci_init(
- qdev_get_gpio_in(s->mpu->gpio, N8X0_BT_HOST_WKUP_GPIO));
+ CharDriverState *radio = uart_hci_init();
qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_RESET_GPIO,
csrhci_pins_get(radio)[csrhci_pin_reset]);
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index d688372ca3..b77c0366e4 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -458,7 +458,7 @@ qemu_irq *csrhci_pins_get(CharDriverState *chr)
return s->pins;
}
-CharDriverState *uart_hci_init(qemu_irq wakeup)
+CharDriverState *uart_hci_init(void)
{
struct csrhci_s *s = (struct csrhci_s *)
g_malloc0(sizeof(struct csrhci_s));
diff --git a/include/hw/bt.h b/include/hw/bt.h
index 963f330138..2fa22bdab6 100644
--- a/include/hw/bt.h
+++ b/include/hw/bt.h
@@ -128,7 +128,7 @@ enum {
__csrhci_pins,
};
qemu_irq *csrhci_pins_get(CharDriverState *chr);
-CharDriverState *uart_hci_init(qemu_irq wakeup);
+CharDriverState *uart_hci_init(void);
/* bt-l2cap.c */
struct bt_l2cap_device_s;