Skip to content

Commit

Permalink
staging: comedi: Fix 80 characters limit and printk issues in skel.c
Browse files Browse the repository at this point in the history
This is a patch to the skel.c file that fixes the 80 characters limit and
printk warnings found by the checkpatch.pl tool

Signed-off-by: Ellwyn Cole <ellwync@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ellwyn Cole authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 289d4e1 commit 588063a
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions drivers/staging/comedi/drivers/skel.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ MODULE_DEVICE_TABLE(pci, skel_pci_table);

/* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the struct comedi_device struct. */
feel free to suggest moving the variable to the struct comedi_device struct.
*/
struct skel_private {

int data;
Expand Down Expand Up @@ -211,7 +212,7 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct comedi_subdevice *s;

printk("comedi%d: skel: ", dev->minor);
pr_info("comedi%d: skel: ", dev->minor);

/*
* If you can probe the device to determine what device in a series
Expand Down Expand Up @@ -282,7 +283,7 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->type = COMEDI_SUBD_UNUSED;
}

printk("attached\n");
pr_info("attached\n");

return 0;
}
Expand All @@ -297,7 +298,7 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
static int skel_detach(struct comedi_device *dev)
{
printk("comedi%d: skel: remove\n", dev->minor);
pr_info("comedi%d: skel: remove\n", dev->minor);

return 0;
}
Expand Down Expand Up @@ -336,7 +337,7 @@ static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
if (i == TIMEOUT) {
/* printk() should be used instead of printk()
* whenever the code can be called from real-time. */
printk("timeout\n");
pr_info("timeout\n");
return -ETIMEDOUT;
}

Expand Down Expand Up @@ -397,7 +398,8 @@ static int skel_ai_cmdtest(struct comedi_device *dev,
if (err)
return 1;

/* step 2: make sure trigger sources are unique and mutually compatible */
/* step 2: make sure trigger sources are unique and mutually compatible
*/

/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
Expand Down Expand Up @@ -529,7 +531,7 @@ static int skel_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
int i;
int chan = CR_CHAN(insn->chanspec);

printk("skel_ao_winsn\n");
pr_info("skel_ao_winsn\n");
/* Writing a list of values to an AO channel is probably not
* very useful, but that's how the interface is defined. */
for (i = 0; i < insn->n; i++) {
Expand Down Expand Up @@ -623,6 +625,7 @@ static int skel_dio_insn_config(struct comedi_device *dev,
* as necessary.
*/
COMEDI_INITCLEANUP(driver_skel);
/* If you are writing a PCI driver you should use COMEDI_PCI_INITCLEANUP instead.
*/
/* If you are writing a PCI driver you should use COMEDI_PCI_INITCLEANUP
* instead.
*/
/* COMEDI_PCI_INITCLEANUP(driver_skel, skel_pci_table) */

0 comments on commit 588063a

Please sign in to comment.