evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_mio_cs: cleanup cs_attach()

Browse source 
Absorb the code from mio_cs_config() into this function and
properly return the error if the configuration fails.

Remove the DPRINTK() function trace message.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-01-25 17:34:27 -07:00 • committed by Greg Kroah-Hartman
parent 1b69a7577a
commit e5e7ff89e6
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/comedi/drivers/ni_mio_cs.c
View file

@ -350,32 +350,24 @@ static int mio_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data)
return -ENODEV; return -ENODEV;
} }
static void mio_cs_config(struct pcmcia_device *link) static int cs_attach(struct pcmcia_device *link)
{ {
int ret; int ret;
DPRINTK("mio_cs_config(link=%p)\n", link); cur_dev = link;
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
ret = pcmcia_loop_config(link, mio_pcmcia_config_loop, NULL); ret = pcmcia_loop_config(link, mio_pcmcia_config_loop, NULL);
if (ret) { if (ret) {
dev_warn(&link->dev, "no configuration found\n"); dev_warn(&link->dev, "no configuration found\n");
return; return ret;
} }
if (!link->irq) if (!link->irq)
dev_info(&link->dev, "no IRQ available\n"); dev_info(&link->dev, "no IRQ available\n");
ret = pcmcia_enable_device(link); return pcmcia_enable_device(link);
}
static int cs_attach(struct pcmcia_device *link)
{
cur_dev = link;
mio_cs_config(link);
return 0;
} }
static void cs_detach(struct pcmcia_device *link) static void cs_detach(struct pcmcia_device *link)