Commit b48ad330 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_670x: change printk's to cleaned up dev_printk's 



Convert all the prink's in this file to dev_prink's.

Change the INFO message in ni_670x_find_device into a dev_warn().
This message is only displayed if a matching device was not found.
A warning is more appropriate here than info.

Consolidate the attach messages into one dev_info() output after
the successful attach.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2be03665

drivers/staging/comedi/drivers/ni_670x.c

+4 −6
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int ni_670x_find_device(struct comedi_device *dev, int bus, int slot) 
			}

		}

	}

	printk(KERN_INFO "no device found\n");

	dev_warn(dev->class_dev, "no device found\n");

	mite_list_devices();

	return -EIO;

}
@@ -231,8 +231,6 @@ static int ni_670x_attach(struct comedi_device *dev, 
	int ret;

	int i;



	printk(KERN_INFO "comedi%d: ni_670x: ", dev->minor);



	ret = alloc_private(dev, sizeof(*devpriv));

	if (ret < 0)

		return ret;
@@ -245,12 +243,11 @@ static int ni_670x_attach(struct comedi_device *dev, 


	ret = mite_setup(devpriv->mite);

	if (ret < 0) {

		printk(KERN_WARNING "error setting up mite\n");

		dev_warn(dev->class_dev, "error setting up mite\n");

		return ret;

	}

	dev->board_name = thisboard->name;

	dev->irq = mite_irq(devpriv->mite);

	printk(KERN_INFO " %s", dev->board_name);



	ret = comedi_alloc_subdevices(dev, 2);

	if (ret)
@@ -295,7 +292,8 @@ static int ni_670x_attach(struct comedi_device *dev, 
	/* Config of ao registers */

	writel(0x00, devpriv->mite->daq_io_addr + AO_CONTROL_OFFSET);



	printk(KERN_INFO "attached\n");

	dev_info(dev->class_dev, "%s: %s attached\n",

		dev->driver->driver_name, dev->board_name);



	return 1;

}