Commit 15b99ac1 authored by Dominik Brodowski's avatar Dominik Brodowski

[PATCH] pcmcia: add return value to _config() functions

Most of the driver initialization isn't done in the .probe function, but in
the internal _config() functions. Make them return a value, so that .probe
can properly report whether the probing of the device succeeded or not.
Signed-off-by: 's avatarDominik Brodowski <linux@dominikbrodowski.net>
parent fba395ee
......@@ -85,7 +85,7 @@ typedef struct bluecard_info_t {
} bluecard_info_t;
static void bluecard_config(struct pcmcia_device *link);
static int bluecard_config(struct pcmcia_device *link);
static void bluecard_release(struct pcmcia_device *link);
static void bluecard_detach(struct pcmcia_device *p_dev);
......@@ -856,7 +856,7 @@ static int bluecard_close(bluecard_info_t *info)
return 0;
}
static int bluecard_attach(struct pcmcia_device *link)
static int bluecard_probe(struct pcmcia_device *link)
{
bluecard_info_t *info;
......@@ -880,9 +880,7 @@ static int bluecard_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
bluecard_config(link);
return 0;
return bluecard_config(link);
}
......@@ -912,7 +910,7 @@ static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t
return pcmcia_parse_tuple(handle, tuple, parse);
}
static void bluecard_config(struct pcmcia_device *link)
static int bluecard_config(struct pcmcia_device *link)
{
bluecard_info_t *info = link->priv;
tuple_t tuple;
......@@ -973,13 +971,14 @@ static void bluecard_config(struct pcmcia_device *link)
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
failed:
bluecard_release(link);
return -ENODEV;
}
......@@ -1008,7 +1007,7 @@ static struct pcmcia_driver bluecard_driver = {
.drv = {
.name = "bluecard_cs",
},
.probe = bluecard_attach,
.probe = bluecard_probe,
.remove = bluecard_detach,
.id_table = bluecard_ids,
};
......
......@@ -88,7 +88,7 @@ typedef struct bt3c_info_t {
} bt3c_info_t;
static void bt3c_config(struct pcmcia_device *link);
static int bt3c_config(struct pcmcia_device *link);
static void bt3c_release(struct pcmcia_device *link);
static void bt3c_detach(struct pcmcia_device *p_dev);
......@@ -645,7 +645,7 @@ static int bt3c_close(bt3c_info_t *info)
return 0;
}
static int bt3c_attach(struct pcmcia_device *link)
static int bt3c_probe(struct pcmcia_device *link)
{
bt3c_info_t *info;
......@@ -669,9 +669,7 @@ static int bt3c_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
bt3c_config(link);
return 0;
return bt3c_config(link);
}
......@@ -710,7 +708,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *
return get_tuple(handle, tuple, parse);
}
static void bt3c_config(struct pcmcia_device *link)
static int bt3c_config(struct pcmcia_device *link)
{
static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
bt3c_info_t *info = link->priv;
......@@ -809,13 +807,14 @@ found_port:
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
failed:
bt3c_release(link);
return -ENODEV;
}
......@@ -841,7 +840,7 @@ static struct pcmcia_driver bt3c_driver = {
.drv = {
.name = "bt3c_cs",
},
.probe = bt3c_attach,
.probe = bt3c_probe,
.remove = bt3c_detach,
.id_table = bt3c_ids,
};
......
......@@ -84,7 +84,7 @@ typedef struct btuart_info_t {
} btuart_info_t;
static void btuart_config(struct pcmcia_device *link);
static int btuart_config(struct pcmcia_device *link);
static void btuart_release(struct pcmcia_device *link);
static void btuart_detach(struct pcmcia_device *p_dev);
......@@ -576,7 +576,7 @@ static int btuart_close(btuart_info_t *info)
return 0;
}
static int btuart_attach(struct pcmcia_device *link)
static int btuart_probe(struct pcmcia_device *link)
{
btuart_info_t *info;
......@@ -600,9 +600,7 @@ static int btuart_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
btuart_config(link);
return 0;
return btuart_config(link);
}
......@@ -641,7 +639,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *
return get_tuple(handle, tuple, parse);
}
static void btuart_config(struct pcmcia_device *link)
static int btuart_config(struct pcmcia_device *link)
{
static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
btuart_info_t *info = link->priv;
......@@ -741,13 +739,14 @@ found_port:
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
failed:
btuart_release(link);
return -ENODEV;
}
......@@ -772,7 +771,7 @@ static struct pcmcia_driver btuart_driver = {
.drv = {
.name = "btuart_cs",
},
.probe = btuart_attach,
.probe = btuart_probe,
.remove = btuart_detach,
.id_table = btuart_ids,
};
......
......@@ -87,7 +87,7 @@ typedef struct dtl1_info_t {
} dtl1_info_t;
static void dtl1_config(struct pcmcia_device *link);
static int dtl1_config(struct pcmcia_device *link);
static void dtl1_release(struct pcmcia_device *link);
static void dtl1_detach(struct pcmcia_device *p_dev);
......@@ -555,7 +555,7 @@ static int dtl1_close(dtl1_info_t *info)
return 0;
}
static int dtl1_attach(struct pcmcia_device *link)
static int dtl1_probe(struct pcmcia_device *link)
{
dtl1_info_t *info;
......@@ -579,9 +579,7 @@ static int dtl1_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
dtl1_config(link);
return 0;
return dtl1_config(link);
}
......@@ -620,7 +618,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *
return get_tuple(handle, tuple, parse);
}
static void dtl1_config(struct pcmcia_device *link)
static int dtl1_config(struct pcmcia_device *link)
{
dtl1_info_t *info = link->priv;
tuple_t tuple;
......@@ -693,13 +691,14 @@ static void dtl1_config(struct pcmcia_device *link)
link->dev_node = &info->node;
link->state &= ~DEV_CONFIG_PENDING;
return;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
failed:
dtl1_release(link);
return -ENODEV;
}
......@@ -727,7 +726,7 @@ static struct pcmcia_driver dtl1_driver = {
.drv = {
.name = "dtl1_cs",
},
.probe = dtl1_attach,
.probe = dtl1_probe,
.remove = dtl1_detach,
.id_table = dtl1_ids,
};
......
......@@ -1759,7 +1759,7 @@ static void cmm_cm4000_release(struct pcmcia_device * link)
/*==== Interface to PCMCIA Layer =======================================*/
static void cm4000_config(struct pcmcia_device * link, int devno)
static int cm4000_config(struct pcmcia_device * link, int devno)
{
struct cm4000_dev *dev;
tuple_t tuple;
......@@ -1846,7 +1846,7 @@ static void cm4000_config(struct pcmcia_device * link, int devno)
link->dev_node = &dev->node;
link->state &= ~DEV_CONFIG_PENDING;
return;
return 0;
cs_failed:
cs_error(link, fail_fn, fail_rc);
......@@ -1854,6 +1854,7 @@ cs_release:
cm4000_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
static int cm4000_suspend(struct pcmcia_device *link)
......@@ -1883,10 +1884,10 @@ static void cm4000_release(struct pcmcia_device *link)
pcmcia_disable_device(link);
}
static int cm4000_attach(struct pcmcia_device *link)
static int cm4000_probe(struct pcmcia_device *link)
{
struct cm4000_dev *dev;
int i;
int i, ret;
for (i = 0; i < CM4000_MAX_DEV; i++)
if (dev_table[i] == NULL)
......@@ -1913,7 +1914,9 @@ static int cm4000_attach(struct pcmcia_device *link)
init_waitqueue_head(&dev->readq);
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
cm4000_config(link, i);
ret = cm4000_config(link, i);
if (ret)
return ret;
class_device_create(cmm_class, NULL, MKDEV(major, i), NULL,
"cmm%d", i);
......@@ -1968,7 +1971,7 @@ static struct pcmcia_driver cm4000_driver = {
.drv = {
.name = "cm4000_cs",
},
.probe = cm4000_attach,
.probe = cm4000_probe,
.remove = cm4000_detach,
.suspend = cm4000_suspend,
.resume = cm4000_resume,
......
......@@ -514,7 +514,7 @@ static void cm4040_reader_release(struct pcmcia_device *link)
return;
}
static void reader_config(struct pcmcia_device *link, int devno)
static int reader_config(struct pcmcia_device *link, int devno)
{
struct reader_dev *dev;
tuple_t tuple;
......@@ -610,13 +610,14 @@ static void reader_config(struct pcmcia_device *link, int devno)
link->io.BasePort1, link->io.BasePort1+link->io.NumPorts1);
DEBUGP(2, dev, "<- reader_config (succ)\n");
return;
return 0;
cs_failed:
cs_error(link, fail_fn, fail_rc);
cs_release:
reader_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}
static void reader_release(struct pcmcia_device *link)
......@@ -625,10 +626,10 @@ static void reader_release(struct pcmcia_device *link)
pcmcia_disable_device(link);
}
static int reader_attach(struct pcmcia_device *link)
static int reader_probe(struct pcmcia_device *link)
{
struct reader_dev *dev;
int i;
int i, ret;
for (i = 0; i < CM_MAX_DEV; i++) {
if (dev_table[i] == NULL)
......@@ -659,7 +660,9 @@ static int reader_attach(struct pcmcia_device *link)
dev->poll_timer.function = &cm4040_do_poll;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
reader_config(link, i);
ret = reader_config(link, i);
if (ret)
return ret;
class_device_create(cmx_class, NULL, MKDEV(major, i), NULL,
"cmx%d", i);
......@@ -715,7 +718,7 @@ static struct pcmcia_driver reader_driver = {
.drv = {
.name = "cm4040_cs",
},
.probe = reader_attach,
.probe = reader_probe,
.remove = reader_detach,
.id_table = cm4040_ids,
};
......
......@@ -484,7 +484,7 @@ static void mgslpc_wait_until_sent(struct tty_struct *tty, int timeout);
/* PCMCIA prototypes */
static void mgslpc_config(struct pcmcia_device *link);
static int mgslpc_config(struct pcmcia_device *link);
static void mgslpc_release(u_long arg);
static void mgslpc_detach(struct pcmcia_device *p_dev);
......@@ -533,9 +533,10 @@ static void ldisc_receive_buf(struct tty_struct *tty,
}
}
static int mgslpc_attach(struct pcmcia_device *link)
static int mgslpc_probe(struct pcmcia_device *link)
{
MGSLPC_INFO *info;
int ret;
if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgslpc_attach\n");
......@@ -578,7 +579,9 @@ static int mgslpc_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
mgslpc_config(link);
ret = mgslpc_config(link);
if (ret)
return ret;
mgslpc_add_device(info);
......@@ -591,7 +594,7 @@ static int mgslpc_attach(struct pcmcia_device *link)
#define CS_CHECK(fn, ret) \
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
static void mgslpc_config(struct pcmcia_device *link)
static int mgslpc_config(struct pcmcia_device *link)
{
MGSLPC_INFO *info = link->priv;
tuple_t tuple;
......@@ -680,11 +683,12 @@ static void mgslpc_config(struct pcmcia_device *link)
printk("\n");
link->state &= ~DEV_CONFIG_PENDING;
return;
return 0;
cs_failed:
cs_error(link, last_fn, last_ret);
mgslpc_release((u_long)link);
return -ENODEV;
}
/* Card has been removed.
......@@ -3003,7 +3007,7 @@ static struct pcmcia_driver mgslpc_driver = {
.drv = {
.name = "synclink_cs",
},
.probe = mgslpc_attach,
.probe = mgslpc_probe,
.remove = mgslpc_detach,
.id_table = mgslpc_ids,
.suspend = mgslpc_suspend,
......
......@@ -88,7 +88,7 @@ typedef struct ide_info_t {
} ide_info_t;
static void ide_release(struct pcmcia_device *);
static void ide_config(struct pcmcia_device *);
static int ide_config(struct pcmcia_device *);
static void ide_detach(struct pcmcia_device *p_dev);
......@@ -103,7 +103,7 @@ static void ide_detach(struct pcmcia_device *p_dev);
======================================================================*/
static int ide_attach(struct pcmcia_device *link)
static int ide_probe(struct pcmcia_device *link)
{
ide_info_t *info;
......@@ -126,9 +126,7 @@ static int ide_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
ide_config(link);
return 0;
return ide_config(link);
} /* ide_attach */
/*======================================================================
......@@ -172,7 +170,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
#define CS_CHECK(fn, ret) \
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
static void ide_config(struct pcmcia_device *link)
static int ide_config(struct pcmcia_device *link)
{
ide_info_t *info = link->priv;
tuple_t tuple;
......@@ -327,7 +325,7 @@ static void ide_config(struct pcmcia_device *link)
link->state &= ~DEV_CONFIG_PENDING;
kfree(stk);
return;
return 0;
err_mem:
printk(KERN_NOTICE "ide-cs: ide_config failed memory allocation\n");
......@@ -339,6 +337,7 @@ failed:
kfree(stk);
ide_release(link);
link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
} /* ide_config */
/*======================================================================
......@@ -424,7 +423,7 @@ static struct pcmcia_driver ide_cs_driver = {
.drv = {
.name = "ide-cs",
},
.probe = ide_attach,
.probe = ide_probe,
.remove = ide_detach,
.id_table = ide_ids,
};
......
......@@ -51,7 +51,7 @@ MODULE_LICENSE("GPL");
handler.
*/
static void avmcs_config(struct pcmcia_device *link);
static int avmcs_config(struct pcmcia_device *link);
static void avmcs_release(struct pcmcia_device *link);
/*
......@@ -99,7 +99,7 @@ typedef struct local_info_t {
======================================================================*/
static int avmcs_attach(struct pcmcia_device *p_dev)
static int avmcs_probe(struct pcmcia_device *p_dev)
{
local_info_t *local;
......@@ -128,12 +128,10 @@ static int avmcs_attach(struct pcmcia_device *p_dev)
p_dev->priv = local;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
avmcs_config(p_dev);
return 0;
return avmcs_config(p_dev);
err:
return -EINVAL;
return -ENOMEM;
} /* avmcs_attach */
/*======================================================================
......@@ -185,7 +183,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
return get_tuple(handle, tuple, parse);
}
static void avmcs_config(struct pcmcia_device *link)
static int avmcs_config(struct pcmcia_device *link)
{
tuple_t tuple;
cisparse_t parse;
......@@ -219,7 +217,7 @@ static void avmcs_config(struct pcmcia_device *link)
if (i != CS_SUCCESS) {
cs_error(link, ParseTuple, i);
link->state &= ~DEV_CONFIG_PENDING;
return;
return -ENODEV;
}
/* Configure card */
......@@ -319,7 +317,7 @@ found_port:
/* If any step failed, release any partially configured state */
if (i != 0) {
avmcs_release(link);
return;
return -ENODEV;
}
......@@ -333,9 +331,10 @@ found_port:
printk(KERN_ERR "avm_cs: failed to add AVM-%s-Controller at i/o %#x, irq %d\n",
dev->node.dev_name, link->io.BasePort1, link->irq.AssignedIRQ);
avmcs_release(link);
return;
return -ENODEV;
}
dev->node.minor = i;
return 0;
} /* avmcs_config */
......@@ -367,7 +366,7 @@ static struct pcmcia_driver avmcs_driver = {
.drv = {
.name = "avm_cs",
},
.probe = avmcs_attach,
.probe = avmcs_probe,
.remove = avmcs_detach,
.id_table = avmcs_ids,
};
......
......@@ -67,7 +67,7 @@ module_param(isdnprot, int, 0);
handler.
*/
static void avma1cs_config(struct pcmcia_device *link);
static int avma1cs_config(struct pcmcia_device *link);
static void avma1cs_release(struct pcmcia_device *link);
/*
......@@ -116,7 +116,7 @@ typedef struct local_info_t {
======================================================================*/
static int avma1cs_attach(struct pcmcia_device *p_dev)
static int avma1cs_probe(struct pcmcia_device *p_dev)
{
local_info_t *local;
......@@ -150,9 +150,7 @@ static int avma1cs_attach(struct pcmcia_device *p_dev)
p_dev->conf.Present = PRESENT_OPTION;
p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
avma1cs_config(p_dev);
return 0;
return avma1cs_config(p_dev);
} /* avma1cs_attach */
/*======================================================================
......@@ -206,7 +204,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
return get_tuple(handle, tuple, parse);
}
static void avma1cs_config(struct pcmcia_device *link)
static int avma1cs_config(struct pcmcia_device *link)
{
tuple_t tuple;
cisparse_t parse;
......@@ -242,7 +240,7 @@ static void avma1cs_config(struct pcmcia_device *link)
if (i != CS_SUCCESS) {
cs_error(link, ParseTuple, i);
link->state &= ~DEV_CONFIG_PENDING;
return;
return -ENODEV;
}
/* Configure card */
......@@ -325,7 +323,7 @@ found_port:
/* If any step failed, release any partially configured state */
if (i != 0) {
avma1cs_release(link);
return;
return -ENODEV;
}
printk(KERN_NOTICE "avma1_cs: checking at i/o %#x, irq %d\n",
......@@ -340,10 +338,11 @@ found_port:
if (i < 0) {
printk(KERN_ERR "avma1_cs: failed to initialize AVM A1 PCMCIA %d at i/o %#x\n", i, link->io.BasePort1);
avma1cs_release(link);
return;
return -ENODEV;
}
dev->node.minor = i;
return 0;
} /* avma1cs_config */
/*======================================================================
......@@ -379,7 +378,7 @@ static struct pcmcia_driver avma1cs_driver = {
.drv = {
.name = "avma1_cs",
},
.probe = avma1cs_attach,
.probe = avma1cs_probe,
.remove = avma1cs_detach,
.id_table = avma1cs_ids,
};
......
......@@ -94,7 +94,7 @@ module_param(protocol, int, 0);
handler.
*/
static void elsa_cs_config(struct pcmcia_device *link);
static int elsa_cs_config(struct pcmcia_device *link);
static void elsa_cs_release(struct pcmcia_device *link);
/*
......@@ -139,7 +139,7 @@ typedef struct local_info_t {
======================================================================*/
static int elsa_cs_attach(struct pcmcia_device *link)
static int elsa_cs_probe(struct pcmcia_device *link)
{
local_info_t *local;
......@@ -175,9 +175,7 @@ static int elsa_cs_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
elsa_cs_config(link);
return 0;
return elsa_cs_config(link);
} /* elsa_cs_attach */
/*======================================================================
......@@ -235,7 +233,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
return get_tuple(handle, tuple, parse);
}
static void elsa_cs_config(struct pcmcia_device *link)
static int elsa_cs_config(struct pcmcia_device *link)
{
tuple_t tuple;
cisparse_t parse;
......@@ -346,10 +344,11 @@ static void elsa_cs_config(struct pcmcia_device *link)
} else
((local_info_t*)link->priv)->cardnr = i;
return;
return 0;
cs_failed:
cs_error(link, last_fn, i);
elsa_cs_release(link);
return -ENODEV;
} /* elsa_cs_config */
/*======================================================================
......@@ -406,7 +405,7 @@ static struct pcmcia_driver elsa_cs_driver = {
.drv = {
.name = "elsa_cs",
},
.probe = elsa_cs_attach,
.probe = elsa_cs_probe,
.remove = elsa_cs_detach,
.id_table = elsa_ids,
.suspend = elsa_suspend,
......
......@@ -95,7 +95,7 @@ module_param(protocol, int, 0);
event handler.
*/
static void sedlbauer_config(struct pcmcia_device *link);
static int sedlbauer_config(struct pcmcia_device *link);
static void sedlbauer_release(struct pcmcia_device *link);
/*
......@@ -148,7 +148,7 @@ typedef struct local_info_t {
======================================================================*/
static int sedlbauer_attach(struct pcmcia_device *link)
static int sedlbauer_probe(struct pcmcia_device *link)
{
local_info_t *local;
......@@ -187,9 +187,7 @@ static int sedlbauer_attach(struct pcmcia_device *link)
link->conf.IntType = INT_MEMORY_AND_IO;
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
sedlbauer_config(link);
return 0;
return sedlbauer_config(link);
} /* sedlbauer_attach */
/*======================================================================
......@@ -224,7 +222,7 @@ static void sedlbauer_detach(struct pcmcia_device *link)
#define CS_CHECK(fn, ret) \
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
static void sedlbauer_config(struct pcmcia_device *link)
static int sedlbauer_config(struct pcmcia_device *link)
{
local_info_t *dev = link->priv;
tuple_t tuple;
......@@ -423,14 +421,16 @@ static void sedlbauer_config(struct pcmcia_device *link)
printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n",
last_ret, link->io.BasePort1);
sedlbauer_release(link);
return -ENODEV;
} else
((local_info_t*)link->priv)->cardnr = last_ret;
return;