From: H Hartley Sweeten Date: Tue, 9 Apr 2013 23:09:10 +0000 (-0700) Subject: staging: comedi: pcl730: cleanup dev->board_name usage X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3f7b35ce30b5fceddaf5d9a8f33f5dcf0985e3b3;p=deliverable%2Flinux.git staging: comedi: pcl730: 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/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c index e3de49937452..371f76cabb37 100644 --- a/drivers/staging/comedi/drivers/pcl730.c +++ b/drivers/staging/comedi/drivers/pcl730.c @@ -72,11 +72,10 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) iorange = board->io_range; printk(KERN_INFO "comedi%d: pcl730: board=%s 0x%04lx ", dev->minor, board->name, iobase); - if (!request_region(iobase, iorange, "pcl730")) { + if (!request_region(iobase, iorange, dev->board_name)) { printk("I/O port conflict\n"); return -EIO; } - dev->board_name = board->name; dev->iobase = iobase; dev->irq = 0;