Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337104
b: refs/heads/master
c: 66ae18f
h: refs/heads/master
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent 1d6d4ce commit 1f24e8d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 351be7c9facb78b5b0f0d93fb70cd28180b61970
refs/heads/master: 66ae18fa13c2925fbfb31fcdf00b45a76547cb5b
20 changes: 12 additions & 8 deletions trunk/drivers/staging/comedi/drivers/ni_pcimio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1384,8 +1384,9 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
/* FIXME: DIO_Output_Register (16 bit reg) is replaced by M_Offset_Static_Digital_Output (32 bit)
and M_Offset_SCXI_Serial_Data_Out (8 bit) */
default:
printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
dev_warn(dev->class_dev,
"%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
BUG();
return;
break;
Expand Down Expand Up @@ -1421,8 +1422,9 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
offset = M_Offset_G01_Status;
break;
default:
printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
dev_warn(dev->class_dev,
"%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
BUG();
return 0;
break;
Expand Down Expand Up @@ -1465,8 +1467,9 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
offset = M_Offset_G1_Load_B;
break;
default:
printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
dev_warn(dev->class_dev,
"%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
BUG();
return;
break;
Expand All @@ -1493,8 +1496,9 @@ static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg)
offset = M_Offset_G1_Save;
break;
default:
printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
dev_warn(dev->class_dev,
"%s: bug! unhandled register=0x%x in switch.\n",
__func__, reg);
BUG();
return 0;
break;
Expand Down

0 comments on commit 1f24e8d

Please sign in to comment.