Staging: comedi: Fix coding style issues in drivers.c (88ab8a84) · Commits · 戴 / test

drivers/staging/comedi/drivers.c

+15 −11

Original line number	Diff line number	Diff line
		@@ -117,8 +117,7 @@ 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");
		printk(KERN_INFO "comedi: failed to increment module count, skipping\n");
		continue;
		}
		if (driv->num_names) {
		@@ -205,8 +204,7 @@ int comedi_driver_unregister(struct comedi_driver *driver)
		mutex_lock(&dev->mutex);
		if (dev->attached && dev->driver == driver) {
		if (dev->use_count)
		printk
		(KERN_WARNING "BUG! detaching device with use_count=%d\n",
		printk(KERN_WARNING "BUG! detaching device with use_count=%d\n",
		dev->use_count);
		comedi_device_detach(dev);
		}
		@@ -442,7 +440,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));
		if (s->async_dma_dir != DMA_NONE) {
		dma_free_coherent(dev->hw_dev,
		PAGE_SIZE,
		@@ -494,8 +494,10 @@ int comedi_buf_alloc(struct comedi_device dev, struct comedi_subdevice s,
		break;

		set_bit(PG_reserved,
		&(virt_to_page(async->buf_page_list[i].virt_addr)->flags));
		pages[i] = virt_to_page(async->buf_page_list[i].virt_addr);
		&(virt_to_page(async->buf_page_list[i].
		virt_addr)->flags));
		pages[i] = virt_to_page(async->buf_page_list[i].
		virt_addr);
		}
		}
		if (i == n_pages) {
		@@ -512,7 +514,10 @@ int comedi_buf_alloc(struct comedi_device dev, struct comedi_subdevice s,
		NULL) {
		break;
		}
		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));
		if (s->async_dma_dir != DMA_NONE) {
		dma_free_coherent(dev->hw_dev,
		PAGE_SIZE,
		@@ -644,8 +649,7 @@ 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");
		printk(KERN_INFO "comedi: attempted to write-free more bytes than have been write-allocated.\n");
		nbytes = async->buf_write_alloc_count - async->buf_write_count;
		}
		async->buf_write_count += nbytes;

Admin message