Prev: staging:comedi: Fixed coding conventions on `adl_pci9111.c'
Next: Staging: comedi: fix code warnings in adl_pci9111.c
From: Greg KH on 17 Jun 2010 19:10
On Thu, Jun 17, 2010 at 10:00:11AM +0300, Matti Lammi wrote:
> Fixed a few "line over 80 characters" warnings. One of those lines were an
> actual code line and I don't know if my corresction is sufficent with that
> part. This is my third patch.
>
> Signed-off-by: Matti Lammi <mattij.lammi(a)gmail.com>
> ---
> drivers/staging/comedi/drivers.c | 17 +++++++++++------
> 1 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
> index 4a29ed7..9dcc5ef 100644
> --- a/drivers/staging/comedi/drivers.c
> +++ b/drivers/staging/comedi/drivers.c
> @@ -118,7 +118,8 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> for (driv = comedi_drivers; driv; driv = driv->next) {
> if (!try_module_get(driv->module)) {
> printk
> - (KERN_INFO "comedi: failed to increment module count, skipping\n");
> + (KERN_INFO "comedi: failed to increment "
> + "module count, skipping\n");
> continue;
> }
> if (driv->num_names) {
> @@ -206,8 +207,8 @@ int comedi_driver_unregister(struct comedi_driver *driver)
> if (dev->attached && dev->driver == driver) {
> if (dev->use_count)
> printk
> - (KERN_WARNING "BUG! detaching device with use_count=%d\n",
> - dev->use_count);
> + (KERN_WARNING "BUG! detaching device "
> + "with use_count=%d\n", dev->use_count);

No, please don't break up printk lines like this. Move the whole thing
to one line and the checkpatch warning will go away.

> comedi_device_detach(dev);
> }
> mutex_unlock(&dev->mutex);
> @@ -442,7 +443,9 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
> unsigned i;
> for (i = 0; i < async->n_buf_pages; ++i) {
> if (async->buf_page_list[i].virt_addr) {
> - clear_bit(PG_reserved, &(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
> + clear_bit(PG_reserved,
> + &(virt_to_page(async->buf_page_list[i].
> + virt_addr)->flags));

Ick, that's not very clean, push the virt_ stuff over a bunch please.

> if (s->async_dma_dir != DMA_NONE) {
> dma_free_coherent(dev->hw_dev,
> PAGE_SIZE,
> @@ -647,7 +650,8 @@ unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes)
> if ((int)(async->buf_write_count + nbytes -
> async->buf_write_alloc_count) > 0) {
> printk
> - (KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
> + (KERN_INFO "comedi: attempted to write-free more "
> + "bytes than have been write-allocated.\n");

Same as above.

> nbytes = async->buf_write_alloc_count - async->buf_write_count;
> }
> async->buf_write_count += nbytes;
> @@ -684,7 +688,8 @@ unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
> if ((int)(async->buf_read_count + nbytes -
> async->buf_read_alloc_count) > 0) {
> printk(KERN_INFO
> - "comedi: attempted to read-free more bytes than have been read-allocated.\n");
> + "comedi: attempted to read-free more bytes "
> + "than have been read-allocated.\n");

And again.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: staging:comedi: Fixed coding conventions on `adl_pci9111.c'
Next: Staging: comedi: fix code warnings in adl_pci9111.c