提交 d1db2a41 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

staging: comedi: quatech_daqp_cs: remove forward declarations

Move some of the functions to remove the need for the forward
declarations.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 433a0e22
master alk-4.19.24 alk-4.19.30 alk-4.19.34 alk-4.19.36 alk-4.19.43 alk-4.19.48 alk-4.19.57 ck-4.19.67 ck-4.19.81 ck-4.19.91 github/fork/deepanshu1422/fix-typo-in-comment github/fork/haosdent/fix-typo linux-next v4.19.91 v4.19.90 v4.19.89 v4.19.88 v4.19.87 v4.19.86 v4.19.85 v4.19.84 v4.19.83 v4.19.82 v4.19.81 v4.19.80 v4.19.79 v4.19.78 v4.19.77 v4.19.76 v4.19.75 v4.19.74 v4.19.73 v4.19.72 v4.19.71 v4.19.70 v4.19.69 v4.19.68 v4.19.67 v4.19.66 v4.19.65 v4.19.64 v4.19.63 v4.19.62 v4.19.61 v4.19.60 v4.19.59 v4.19.58 v4.19.57 v4.19.56 v4.19.55 v4.19.54 v4.19.53 v4.19.52 v4.19.51 v4.19.50 v4.19.49 v4.19.48 v4.19.47 v4.19.46 v4.19.45 v4.19.44 v4.19.43 v4.19.42 v4.19.41 v4.19.40 v4.19.39 v4.19.38 v4.19.37 v4.19.36 v4.19.35 v4.19.34 v4.19.33 v4.19.32 v4.19.31 v4.19.30 v4.19.29 v4.19.28 v4.19.27 v4.19.26 v4.19.25 v4.19.24 v4.19.23 v4.19.22 v4.19.21 v4.19.20 v4.19.19 v4.19.18 v4.19.17 v4.19.16 v4.19.15 v4.19.14 v4.19.13 v4.19.12 v4.19.11 v4.19.10 v4.19.9 v4.19.8 v4.19.7 v4.19.6 v4.19.5 v4.19.4 v4.19.3 v4.19.2 v4.19.1 v4.19 v4.19-rc8 v4.19-rc7 v4.19-rc6 v4.19-rc5 v4.19-rc4 v4.19-rc3 v4.19-rc2 v4.19-rc1 ck-release-21 ck-release-20 ck-release-19.2 ck-release-19.1 ck-release-19 ck-release-18 ck-release-17.2 ck-release-17.1 ck-release-17 ck-release-16 ck-release-15.1 ck-release-15 ck-release-14 ck-release-13.2 ck-release-13 ck-release-12 ck-release-11 ck-release-10 ck-release-9 ck-release-7 alk-release-15 alk-release-14 alk-release-13.2 alk-release-13 alk-release-12 alk-release-11 alk-release-10 alk-release-9 alk-release-7
......@@ -180,19 +180,6 @@ static const struct comedi_lrange range_daqp_ai = { 4, {
static const struct comedi_lrange range_daqp_ao = { 1, {BIP_RANGE(5)} };
/*====================================================================*/
/* comedi interface code */
static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static void daqp_detach(struct comedi_device *dev);
static struct comedi_driver driver_daqp = {
.driver_name = "quatech_daqp_cs",
.module = THIS_MODULE,
.attach = daqp_attach,
.detach = daqp_detach,
};
#ifdef DAQP_DEBUG
static void daqp_dump(struct comedi_device *dev)
......@@ -889,6 +876,13 @@ static void daqp_detach(struct comedi_device *dev)
/* Nothing to cleanup */
}
static struct comedi_driver driver_daqp = {
.driver_name = "quatech_daqp_cs",
.module = THIS_MODULE,
.attach = daqp_attach,
.detach = daqp_detach,
};
/*====================================================================
PCMCIA interface code
......@@ -924,55 +918,29 @@ static void daqp_detach(struct comedi_device *dev)
======================================================================*/
static void daqp_cs_config(struct pcmcia_device *link);
static void daqp_cs_release(struct pcmcia_device *link);
static int daqp_cs_suspend(struct pcmcia_device *p_dev);
static int daqp_cs_resume(struct pcmcia_device *p_dev);
static int daqp_cs_attach(struct pcmcia_device *);
static void daqp_cs_detach(struct pcmcia_device *);
static int daqp_cs_attach(struct pcmcia_device *link)
static int daqp_cs_suspend(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;
}
struct local_info_t *local = link->priv;
/* Allocate space for private device-specific data */
local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
if (!local)
return -ENOMEM;
/* Mark the device as stopped, to block IO until later */
local->stop = 1;
return 0;
}
local->table_index = i;
dev_table[i] = local;
local->link = link;
link->priv = local;
static int daqp_cs_resume(struct pcmcia_device *link)
{
struct local_info_t *local = link->priv;
daqp_cs_config(link);
local->stop = 0;
return 0;
} /* daqp_cs_attach */
}
static void daqp_cs_detach(struct pcmcia_device *link)
static void daqp_cs_release(struct pcmcia_device *link)
{
struct local_info_t *dev = link->priv;
dev->stop = 1;
daqp_cs_release(link);
/* Unlink device structure, and free it */
dev_table[dev->table_index] = NULL;
kfree(dev);
dev_dbg(&link->dev, "daqp_cs_release\n");
pcmcia_disable_device(link);
}
static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data)
......@@ -1009,32 +977,48 @@ static void daqp_cs_config(struct pcmcia_device *link)
failed:
daqp_cs_release(link);
}
} /* daqp_cs_config */
static void daqp_cs_release(struct pcmcia_device *link)
static int daqp_cs_attach(struct pcmcia_device *link)
{
dev_dbg(&link->dev, "daqp_cs_release\n");
struct local_info_t *local;
int i;
pcmcia_disable_device(link);
} /* daqp_cs_release */
dev_dbg(&link->dev, "daqp_cs_attach()\n");
static int daqp_cs_suspend(struct pcmcia_device *link)
{
struct local_info_t *local = link->priv;
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);
/* Mark the device as stopped, to block IO until later */
local->stop = 1;
return 0;
}
static int daqp_cs_resume(struct pcmcia_device *link)
static void daqp_cs_detach(struct pcmcia_device *link)
{
struct local_info_t *local = link->priv;
struct local_info_t *dev = link->priv;
local->stop = 0;
dev->stop = 1;
daqp_cs_release(link);
return 0;
/* Unlink device structure, and free it */
dev_table[dev->table_index] = NULL;
kfree(dev);
}
/*====================================================================*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部