UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: quatech_daqp_cs: cleanup daqp_cs_attach() 

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

Remove the dev_dbg() function trace messages.

Fix the kzalloc(). The preferred form for passing a size of a struct
is:

	p = kzalloc(sizeof(*p), ...);

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 14:59:56 -07:00 committed by Greg Kroah-Hartman
parent 86be5680f5
commit cdcc02291b
1 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/staging/comedi/drivers/quatech_daqp_cs.c
View File

@ -944,11 +944,29 @@ static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data)
return pcmcia_request_io(p_dev);
}
static void daqp_cs_config(struct pcmcia_device *link)
static int daqp_cs_attach(struct pcmcia_device *link)
{
struct local_info_t *local;
int ret;
int i;
dev_dbg(&link->dev, "daqp_cs_config\n");
for (i = 0; i < MAX_DEV; i++)
if (dev_table[i] == NULL)
break;
if (i == MAX_DEV) {
dev_notice(&link->dev, "no devices available\n");
return -ENODEV;
}
/* Allocate space for private device-specific data */
local = kzalloc(sizeof(*local), GFP_KERNEL);
if (!local)
return -ENOMEM;
local->table_index = i;
dev_table[i] = local;
local->link = link;
link->priv = local;
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
@ -966,40 +984,11 @@ static void daqp_cs_config(struct pcmcia_device *link)
if (ret)
goto failed;
return;
return 0;
failed:
pcmcia_disable_device(link);
}
static int daqp_cs_attach(struct pcmcia_device *link)
{
struct local_info_t *local;
int i;
dev_dbg(&link->dev, "daqp_cs_attach()\n");
for (i = 0; i < MAX_DEV; i++)
if (dev_table[i] == NULL)
break;
if (i == MAX_DEV) {
dev_notice(&link->dev, "no devices available\n");
return -ENODEV;
}
/* Allocate space for private device-specific data */
local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
if (!local)
return -ENOMEM;
local->table_index = i;
dev_table[i] = local;
local->link = link;
link->priv = local;
daqp_cs_config(link);
return 0;
return ret;
}
static void daqp_cs_detach(struct pcmcia_device *link)