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

staging: comedi: ni_daq_dio24: cleanup pcmcia probe/remove

Browse source 
Absorb the code from dio24_config() into the probe function,
dio24_cs_attach() and properly return the error code when the
probe fails. This also gets rid of an unnecessary forward
declaration.

For aesthetic reasons, move the remove functio, dio24_cs_detach(),
so it's after the probe function.

Remove a number of dev_{level} noise messages in the probe/remove
functions.

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-30 16:43:48 -07:00 • committed by Greg Kroah-Hartman
parent 7044ae812b
commit 07c5b441de
1 changed files with 19 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
drivers/staging/comedi/drivers/ni_daq_dio24.c
View file

@ -184,45 +184,13 @@ static void dio24_detach(struct comedi_device *dev)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
}; };
static void dio24_config(struct pcmcia_device *link);
struct local_info_t { struct local_info_t {
struct pcmcia_device *link; struct pcmcia_device *link;
struct bus_operations *bus; struct bus_operations *bus;
}; };
static int dio24_cs_attach(struct pcmcia_device *link)
{
struct local_info_t *local;
dev_info(&link->dev, "ni_daq_dio24: HOLA SOY YO - CS-attach!\n");
dev_dbg(&link->dev, "dio24_cs_attach()\n");
/* Allocate space for private device-specific data */
local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
if (!local)
return -ENOMEM;
local->link = link;
link->priv = local;
pcmcia_cur_dev = link;
dio24_config(link);
return 0;
} /* dio24_cs_attach */
static void dio24_cs_detach(struct pcmcia_device *link)
{
pcmcia_disable_device(link);
/* This points to the parent local_info_t struct */
kfree(link->priv);
}
static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev, static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
void *priv_data) void *priv_data)
{ {
if (p_dev->config_index == 0) if (p_dev->config_index == 0)
return -EINVAL; return -EINVAL;
@ -230,13 +198,18 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
return pcmcia_request_io(p_dev); return pcmcia_request_io(p_dev);
} }
static void dio24_config(struct pcmcia_device *link) static int dio24_cs_attach(struct pcmcia_device *link)
{ {
struct local_info_t *local;
int ret; int ret;
dev_info(&link->dev, "ni_daq_dio24: HOLA SOY YO! - config\n"); local = kzalloc(sizeof(*local), GFP_KERNEL);
if (!local)
return -ENOMEM;
local->link = link;
link->priv = local;
dev_dbg(&link->dev, "dio24_config\n"); pcmcia_cur_dev = link;
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO |
CONF_AUTO_SET_IO; CONF_AUTO_SET_IO;
@ -254,11 +227,19 @@ static void dio24_config(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; goto failed;
return; return 0;
failed: failed:
dev_info(&link->dev, "Fallo");
pcmcia_disable_device(link); pcmcia_disable_device(link);
return ret;
}
static void dio24_cs_detach(struct pcmcia_device *link)
{
pcmcia_disable_device(link);
/* This points to the parent local_info_t struct */
kfree(link->priv);
} }
static const struct pcmcia_device_id dio24_cs_ids[] = { static const struct pcmcia_device_id dio24_cs_ids[] = {