diff options
Diffstat (limited to 'drivers/media/dvb/bt8xx/bt878.c')
| -rw-r--r-- | drivers/media/dvb/bt8xx/bt878.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c index c7bbb40223f5..56d8fab688bb 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/dvb/bt8xx/bt878.c | |||
| @@ -75,7 +75,11 @@ EXPORT_SYMBOL(bt878); | |||
| 75 | #if defined(dprintk) | 75 | #if defined(dprintk) |
| 76 | #undef dprintk | 76 | #undef dprintk |
| 77 | #endif | 77 | #endif |
| 78 | #define dprintk if(bt878_debug) printk | 78 | #define dprintk(fmt, arg...) \ |
| 79 | do { \ | ||
| 80 | if (bt878_debug) \ | ||
| 81 | printk(KERN_DEBUG fmt, ##arg); \ | ||
| 82 | } while (0) | ||
| 79 | 83 | ||
| 80 | static void bt878_mem_free(struct bt878 *bt) | 84 | static void bt878_mem_free(struct bt878 *bt) |
| 81 | { | 85 | { |
| @@ -154,7 +158,7 @@ static int bt878_make_risc(struct bt878 *bt) | |||
| 154 | } | 158 | } |
| 155 | 159 | ||
| 156 | if (bt->line_count > 255) { | 160 | if (bt->line_count > 255) { |
| 157 | printk("bt878: buffer size error!\n"); | 161 | printk(KERN_ERR "bt878: buffer size error!\n"); |
| 158 | return -EINVAL; | 162 | return -EINVAL; |
| 159 | } | 163 | } |
| 160 | return 0; | 164 | return 0; |
| @@ -285,7 +289,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) | |||
| 285 | 289 | ||
| 286 | if (astat & (BT878_ASCERR | BT878_AOCERR)) { | 290 | if (astat & (BT878_ASCERR | BT878_AOCERR)) { |
| 287 | if (bt878_verbose) { | 291 | if (bt878_verbose) { |
| 288 | printk("bt878(%d): irq%s%s risc_pc=%08x\n", | 292 | printk(KERN_INFO |
| 293 | "bt878(%d): irq%s%s risc_pc=%08x\n", | ||
| 289 | bt->nr, | 294 | bt->nr, |
| 290 | (astat & BT878_ASCERR) ? " SCERR" : | 295 | (astat & BT878_ASCERR) ? " SCERR" : |
| 291 | "", | 296 | "", |
| @@ -295,8 +300,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) | |||
| 295 | } | 300 | } |
| 296 | if (astat & (BT878_APABORT | BT878_ARIPERR | BT878_APPERR)) { | 301 | if (astat & (BT878_APABORT | BT878_ARIPERR | BT878_APPERR)) { |
| 297 | if (bt878_verbose) { | 302 | if (bt878_verbose) { |
| 298 | printk | 303 | printk(KERN_INFO |
| 299 | ("bt878(%d): irq%s%s%s risc_pc=%08x\n", | 304 | "bt878(%d): irq%s%s%s risc_pc=%08x\n", |
| 300 | bt->nr, | 305 | bt->nr, |
| 301 | (astat & BT878_APABORT) ? " PABORT" : | 306 | (astat & BT878_APABORT) ? " PABORT" : |
| 302 | "", | 307 | "", |
| @@ -308,8 +313,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) | |||
| 308 | } | 313 | } |
| 309 | if (astat & (BT878_AFDSR | BT878_AFTRGT | BT878_AFBUS)) { | 314 | if (astat & (BT878_AFDSR | BT878_AFTRGT | BT878_AFBUS)) { |
| 310 | if (bt878_verbose) { | 315 | if (bt878_verbose) { |
| 311 | printk | 316 | printk(KERN_INFO |
| 312 | ("bt878(%d): irq%s%s%s risc_pc=%08x\n", | 317 | "bt878(%d): irq%s%s%s risc_pc=%08x\n", |
| 313 | bt->nr, | 318 | bt->nr, |
| 314 | (astat & BT878_AFDSR) ? " FDSR" : "", | 319 | (astat & BT878_AFDSR) ? " FDSR" : "", |
| 315 | (astat & BT878_AFTRGT) ? " FTRGT" : | 320 | (astat & BT878_AFTRGT) ? " FTRGT" : |
| @@ -510,7 +515,7 @@ static int __devinit bt878_probe(struct pci_dev *dev, | |||
| 510 | */ | 515 | */ |
| 511 | 516 | ||
| 512 | if ((result = bt878_mem_alloc(bt))) { | 517 | if ((result = bt878_mem_alloc(bt))) { |
| 513 | printk("bt878: failed to allocate memory!\n"); | 518 | printk(KERN_ERR "bt878: failed to allocate memory!\n"); |
| 514 | goto fail2; | 519 | goto fail2; |
| 515 | } | 520 | } |
| 516 | 521 | ||
| @@ -536,7 +541,7 @@ static void __devexit bt878_remove(struct pci_dev *pci_dev) | |||
| 536 | struct bt878 *bt = pci_get_drvdata(pci_dev); | 541 | struct bt878 *bt = pci_get_drvdata(pci_dev); |
| 537 | 542 | ||
| 538 | if (bt878_verbose) | 543 | if (bt878_verbose) |
| 539 | printk("bt878(%d): unloading\n", bt->nr); | 544 | printk(KERN_INFO "bt878(%d): unloading\n", bt->nr); |
| 540 | 545 | ||
| 541 | /* turn off all capturing, DMA and IRQs */ | 546 | /* turn off all capturing, DMA and IRQs */ |
| 542 | btand(~0x13, BT878_AGPIO_DMA_CTL); | 547 | btand(~0x13, BT878_AGPIO_DMA_CTL); |
