aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/dtl1_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bluetooth/dtl1_cs.c')
-rw-r--r--drivers/bluetooth/dtl1_cs.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 7c94aad0b791..bfe9313516fb 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -149,7 +149,7 @@ static void dtl1_write_wakeup(dtl1_info_t *info)
149 } 149 }
150 150
151 do { 151 do {
152 register unsigned int iobase = info->p_dev->io.BasePort1; 152 register unsigned int iobase = info->p_dev->resource[0]->start;
153 register struct sk_buff *skb; 153 register struct sk_buff *skb;
154 register int len; 154 register int len;
155 155
@@ -214,7 +214,7 @@ static void dtl1_receive(dtl1_info_t *info)
214 return; 214 return;
215 } 215 }
216 216
217 iobase = info->p_dev->io.BasePort1; 217 iobase = info->p_dev->resource[0]->start;
218 218
219 do { 219 do {
220 info->hdev->stat.byte_rx++; 220 info->hdev->stat.byte_rx++;
@@ -301,7 +301,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
301 /* our irq handler is shared */ 301 /* our irq handler is shared */
302 return IRQ_NONE; 302 return IRQ_NONE;
303 303
304 iobase = info->p_dev->io.BasePort1; 304 iobase = info->p_dev->resource[0]->start;
305 305
306 spin_lock(&(info->lock)); 306 spin_lock(&(info->lock));
307 307
@@ -461,7 +461,7 @@ static int dtl1_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long
461static int dtl1_open(dtl1_info_t *info) 461static int dtl1_open(dtl1_info_t *info)
462{ 462{
463 unsigned long flags; 463 unsigned long flags;
464 unsigned int iobase = info->p_dev->io.BasePort1; 464 unsigned int iobase = info->p_dev->resource[0]->start;
465 struct hci_dev *hdev; 465 struct hci_dev *hdev;
466 466
467 spin_lock_init(&(info->lock)); 467 spin_lock_init(&(info->lock));
@@ -508,7 +508,8 @@ static int dtl1_open(dtl1_info_t *info)
508 outb(UART_LCR_WLEN8, iobase + UART_LCR); /* Reset DLAB */ 508 outb(UART_LCR_WLEN8, iobase + UART_LCR); /* Reset DLAB */
509 outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase + UART_MCR); 509 outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase + UART_MCR);
510 510
511 info->ri_latch = inb(info->p_dev->io.BasePort1 + UART_MSR) & UART_MSR_RI; 511 info->ri_latch = inb(info->p_dev->resource[0]->start + UART_MSR)
512 & UART_MSR_RI;
512 513
513 /* Turn on interrupts */ 514 /* Turn on interrupts */
514 outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER); 515 outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER);
@@ -533,7 +534,7 @@ static int dtl1_open(dtl1_info_t *info)
533static int dtl1_close(dtl1_info_t *info) 534static int dtl1_close(dtl1_info_t *info)
534{ 535{
535 unsigned long flags; 536 unsigned long flags;
536 unsigned int iobase = info->p_dev->io.BasePort1; 537 unsigned int iobase = info->p_dev->resource[0]->start;
537 struct hci_dev *hdev = info->hdev; 538 struct hci_dev *hdev = info->hdev;
538 539
539 if (!hdev) 540 if (!hdev)