Commit daca497d authored by John Sheehan's avatar John Sheehan Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: fix code warnings in s626.c 



A patch for s626.c to fix some of the warnings
reported by the checkpatch.pl tool, namely,
printk() should include KERN_ facility level
unnecessary whitespace before a quoted newline

Signed-off-by: default avatarJohn Sheehan <john.d.sheehan@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6fd071cc

drivers/staging/comedi/drivers/s626.c

+19 −19
Original line number Diff line number Diff line
@@ -543,13 +543,13 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	devpriv->pdev = pdev;



	if (pdev == NULL) {

		printk("s626_attach: Board not present!!!\n");

		printk(KERN_ERR "s626_attach: Board not present!!!\n");

		return -ENODEV;

	}



	result = comedi_pci_enable(pdev, "s626");

	if (result < 0) {

		printk("s626_attach: comedi_pci_enable fails\n");

		printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n");

		return -ENODEV;

	}

	devpriv->got_regions = 1;
@@ -558,7 +558,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


	devpriv->base_addr = ioremap(resourceStart, SIZEOF_ADDRESS_SPACE);

	if (devpriv->base_addr == NULL) {

		printk("s626_attach: IOREMAP failed\n");

		printk(KERN_ERR "s626_attach: IOREMAP failed\n");

		return -ENODEV;

	}
@@ -579,7 +579,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		    pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma);



		if (devpriv->ANABuf.LogicalBase == NULL) {

			printk("s626_attach: DMA Memory mapping error\n");

			printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");

			return -ENOMEM;

		}
@@ -596,7 +596,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		    pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma);



		if (devpriv->RPSBuf.LogicalBase == NULL) {

			printk("s626_attach: DMA Memory mapping error\n");

			printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");

			return -ENOMEM;

		}
@@ -622,13 +622,13 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


	/* set up interrupt handler */

	if (dev->irq == 0) {

		printk(" unknown irq (bad)\n");

		printk(KERN_ERR " unknown irq (bad)\n");

	} else {

		ret = request_irq(dev->irq, s626_irq_handler, IRQF_SHARED,

				  "s626", dev);



		if (ret < 0) {

			printk(" irq not available\n");

			printk(KERN_ERR " irq not available\n");

			dev->irq = 0;

		}

	}
@@ -1743,7 +1743,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	DEBUG("s626_ai_cmd: entering command function\n");



	if (devpriv->ai_cmd_running) {

		printk("s626_ai_cmd: Another ai_cmd is running %d\n",

		printk(KERN_ERR "s626_ai_cmd: Another ai_cmd is running %d\n",

		       dev->minor);

		return -EBUSY;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE