Skip to content

Commit

Permalink
[PATCH] pcmcia: add return value to _config() functions
Browse files Browse the repository at this point in the history 
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: Dominik Brodowski <[email protected]>
  • Loading branch information
Dominik Brodowski committed Mar 31, 2006
1 parent fba395e commit 15b99ac
Show file tree
Hide file tree
Showing 45 changed files with 379 additions and 404 deletions.
15 changes: 7 additions & 8 deletions drivers/bluetooth/bluecard_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand All @@ -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);
}


Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}


Expand Down Expand Up @@ -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,
};
Expand Down
15 changes: 7 additions & 8 deletions drivers/bluetooth/bt3c_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand All @@ -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);
}


Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -809,13 +807,14 @@ static void bt3c_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:
bt3c_release(link);
return -ENODEV;
}


Expand All @@ -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,
};
Expand Down
15 changes: 7 additions & 8 deletions drivers/bluetooth/btuart_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand All @@ -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);
}


Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -741,13 +739,14 @@ static void btuart_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:
btuart_release(link);
return -ENODEV;
}


Expand All @@ -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,
};
Expand Down
15 changes: 7 additions & 8 deletions drivers/bluetooth/dtl1_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand All @@ -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);
}


Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}


Expand Down Expand Up @@ -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,
};
Expand Down
15 changes: 9 additions & 6 deletions drivers/char/pcmcia/cm4000_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1846,14 +1846,15 @@ 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);
cs_release:
cm4000_release(link);

link->state &= ~DEV_CONFIG_PENDING;
return -ENODEV;
}

static int cm4000_suspend(struct pcmcia_device *link)
Expand Down Expand Up @@ -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)
Expand All @@ -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);
Expand Down Expand Up @@ -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,
Expand Down
15 changes: 9 additions & 6 deletions drivers/char/pcmcia/cm4040_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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,
};
Expand Down
Loading

0 comments on commit 15b99ac

Please sign in to comment.