summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-08 10:56:02 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-08 11:39:19 -0700
commitae5dd5fcab2d9978e1a0a900a8598b4d92f02657 (patch)
treed6927225b24d3860e7db8aedd07d418157d02c8c
parent34b68400ee3aabda0cd0c951fca3b8e6fd96c015 (diff)
staging: comedi: drivers: dev->board_name is always valid
The dev->board_name is always initialized before calling the(*attach) or (*auto_attach) function. The "BUG" check in comedi_device_postconfig() is no longer necessary. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 09d67dac74bc..4a1eb7b7a8da 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -272,13 +272,8 @@ static int comedi_device_postconfig(struct comedi_device *dev)
int ret;
ret = __comedi_device_postconfig(dev);
- if (ret < 0) {
+ if (ret < 0)
return ret;
- }
- if (!dev->board_name) {
- dev_warn(dev->class_dev, "BUG: dev->board_name=NULL\n");
- dev->board_name = "BUG";
- }
smp_wmb();
dev->attached = true;
return 0;