From ae5dd5fcab2d9978e1a0a900a8598b4d92f02657 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 10:56:02 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers.c | 7 +------ 1 file changed, 1 insertion(+), 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; -- 2.34.1