From: H Hartley Sweeten Date: Tue, 9 Apr 2013 23:33:23 +0000 (-0700) Subject: staging: comedi: ni_at_ao: cleanup dev->board_name usage X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ce1edddd8cd1bfce31b7387aba4e755786efc1cc;p=linux.git staging: comedi: ni_at_ao: 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/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index 907f65cdbdc0b..be4e1e111480c 100644 --- a/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/drivers/staging/comedi/drivers/ni_at_ao.c @@ -348,14 +348,12 @@ static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) printk(KERN_INFO "comedi%d: ni_at_ao: 0x%04lx", dev->minor, iobase); - if (!request_region(iobase, ATAO_SIZE, "ni_at_ao")) { + if (!request_region(iobase, ATAO_SIZE, dev->board_name)) { printk(" I/O port conflict\n"); return -EIO; } dev->iobase = iobase; - dev->board_name = board->name; - devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); if (!devpriv) return -ENOMEM;