Commit 46c9fc86 authored by Akinobu Mita's avatar Akinobu Mita Committed by Mauro Carvalho Chehab

V4L/DVB (7076): bt878: include KERN_ facility level

printk should use KERN_* levels.

CC: Manu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a348d200
...@@ -75,7 +75,11 @@ EXPORT_SYMBOL(bt878); ...@@ -75,7 +75,11 @@ EXPORT_SYMBOL(bt878);
#if defined(dprintk) #if defined(dprintk)
#undef dprintk #undef dprintk
#endif #endif
#define dprintk if(bt878_debug) printk #define dprintk(fmt, arg...) \
do { \
if (bt878_debug) \
printk(KERN_DEBUG fmt, ##arg); \
} while (0)
static void bt878_mem_free(struct bt878 *bt) static void bt878_mem_free(struct bt878 *bt)
{ {
...@@ -154,7 +158,7 @@ static int bt878_make_risc(struct bt878 *bt) ...@@ -154,7 +158,7 @@ static int bt878_make_risc(struct bt878 *bt)
} }
if (bt->line_count > 255) { if (bt->line_count > 255) {
printk("bt878: buffer size error!\n"); printk(KERN_ERR "bt878: buffer size error!\n");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -285,7 +289,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) ...@@ -285,7 +289,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
if (astat & (BT878_ASCERR | BT878_AOCERR)) { if (astat & (BT878_ASCERR | BT878_AOCERR)) {
if (bt878_verbose) { if (bt878_verbose) {
printk("bt878(%d): irq%s%s risc_pc=%08x\n", printk(KERN_INFO
"bt878(%d): irq%s%s risc_pc=%08x\n",
bt->nr, bt->nr,
(astat & BT878_ASCERR) ? " SCERR" : (astat & BT878_ASCERR) ? " SCERR" :
"", "",
...@@ -295,8 +300,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) ...@@ -295,8 +300,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
} }
if (astat & (BT878_APABORT | BT878_ARIPERR | BT878_APPERR)) { if (astat & (BT878_APABORT | BT878_ARIPERR | BT878_APPERR)) {
if (bt878_verbose) { if (bt878_verbose) {
printk printk(KERN_INFO
("bt878(%d): irq%s%s%s risc_pc=%08x\n", "bt878(%d): irq%s%s%s risc_pc=%08x\n",
bt->nr, bt->nr,
(astat & BT878_APABORT) ? " PABORT" : (astat & BT878_APABORT) ? " PABORT" :
"", "",
...@@ -308,8 +313,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) ...@@ -308,8 +313,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
} }
if (astat & (BT878_AFDSR | BT878_AFTRGT | BT878_AFBUS)) { if (astat & (BT878_AFDSR | BT878_AFTRGT | BT878_AFBUS)) {
if (bt878_verbose) { if (bt878_verbose) {
printk printk(KERN_INFO
("bt878(%d): irq%s%s%s risc_pc=%08x\n", "bt878(%d): irq%s%s%s risc_pc=%08x\n",
bt->nr, bt->nr,
(astat & BT878_AFDSR) ? " FDSR" : "", (astat & BT878_AFDSR) ? " FDSR" : "",
(astat & BT878_AFTRGT) ? " FTRGT" : (astat & BT878_AFTRGT) ? " FTRGT" :
...@@ -510,7 +515,7 @@ static int __devinit bt878_probe(struct pci_dev *dev, ...@@ -510,7 +515,7 @@ static int __devinit bt878_probe(struct pci_dev *dev,
*/ */
if ((result = bt878_mem_alloc(bt))) { if ((result = bt878_mem_alloc(bt))) {
printk("bt878: failed to allocate memory!\n"); printk(KERN_ERR "bt878: failed to allocate memory!\n");
goto fail2; goto fail2;
} }
...@@ -536,7 +541,7 @@ static void __devexit bt878_remove(struct pci_dev *pci_dev) ...@@ -536,7 +541,7 @@ static void __devexit bt878_remove(struct pci_dev *pci_dev)
struct bt878 *bt = pci_get_drvdata(pci_dev); struct bt878 *bt = pci_get_drvdata(pci_dev);
if (bt878_verbose) if (bt878_verbose)
printk("bt878(%d): unloading\n", bt->nr); printk(KERN_INFO "bt878(%d): unloading\n", bt->nr);
/* turn off all capturing, DMA and IRQs */ /* turn off all capturing, DMA and IRQs */
btand(~0x13, BT878_AGPIO_DMA_CTL); btand(~0x13, BT878_AGPIO_DMA_CTL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment