From: H Hartley Sweeten Date: Tue, 9 Apr 2013 23:29:29 +0000 (-0700) Subject: staging: comedi: poc: cleanup dev->board_name usage X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ba25510ca88bed86e0e1e2537ae914e837afa99;p=linux-beck.git staging: comedi: poc: cleanup dev->board_name usage This legacy driver does no additional probing so the dev->board_name will already be properly initialized by the comedi core before calling the (*attach) function. Remove the unnecessary initialization of dev->board_name and use it when requesting the resources instead of the open-coded strings. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c index d7842c95d982..8a34f6f631fd 100644 --- a/drivers/staging/comedi/drivers/poc.c +++ b/drivers/staging/comedi/drivers/poc.c @@ -147,8 +147,6 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor, board->name, iobase); - dev->board_name = board->name; - if (iobase == 0) { printk(KERN_ERR "io base address required\n"); return -EINVAL; @@ -156,7 +154,7 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) iosize = board->iosize; /* check if io addresses are available */ - if (!request_region(iobase, iosize, "dac02")) { + if (!request_region(iobase, iosize, dev->board_name)) { printk(KERN_ERR "I/O port conflict: failed to allocate ports " "0x%lx to 0x%lx\n", iobase, iobase + iosize - 1); return -EIO;