Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent fba395ee

drivers/bluetooth/bluecard_cs.c

+7 −8
Original line number Diff line number Diff line
@@ -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,

};

drivers/bluetooth/bt3c_cs.c

+7 −8
Original line number Diff line number Diff line
@@ -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,

};

drivers/bluetooth/btuart_cs.c

+7 −8
Original line number Diff line number Diff line
@@ -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,

};

drivers/bluetooth/dtl1_cs.c

+7 −8
Original line number Diff line number Diff line
@@ -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,

};

drivers/char/pcmcia/cm4000_cs.c

+9 −6
Original line number Diff line number Diff line
@@ -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,