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

Commit 70294b46 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[PATCH] pcmcia: remove unneeded Vcc pseudo setting 



As we do not allow setting Vcc in the pcmcia core, and Vpp1 and
Vpp2 can only be set to the same value, a lot of code can be
streamlined.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 4bbed523

drivers/bluetooth/bluecard_cs.c

+0 −4
Original line number Diff line number Diff line
@@ -878,7 +878,6 @@ static int bluecard_attach(struct pcmcia_device *p_dev) 
	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.Vcc = 50;

	link->conf.IntType = INT_MEMORY_AND_IO;



	link->handle = p_dev;
@@ -925,7 +924,6 @@ static void bluecard_config(dev_link_t *link) 
	tuple_t tuple;

	u_short buf[256];

	cisparse_t parse;

	config_info_t config;

	int i, n, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;
@@ -945,8 +943,6 @@ static void bluecard_config(dev_link_t *link) 


	/* Configure card */

	link->state |= DEV_CONFIG;

	i = pcmcia_get_configuration_info(handle, &config);

	link->conf.Vcc = config.Vcc;



	link->conf.ConfigIndex = 0x20;

	link->io.NumPorts1 = 64;

drivers/bluetooth/bt3c_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -670,7 +670,6 @@ static int bt3c_attach(struct pcmcia_device *p_dev) 
	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.Vcc = 50;

	link->conf.IntType = INT_MEMORY_AND_IO;



	link->handle = p_dev;
@@ -728,7 +727,6 @@ static void bt3c_config(dev_link_t *link) 
	u_short buf[256];

	cisparse_t parse;

	cistpl_cftable_entry_t *cf = &parse.cftable_entry;

	config_info_t config;

	int i, j, try, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;
@@ -748,8 +746,6 @@ static void bt3c_config(dev_link_t *link) 


	/* Configure card */

	link->state |= DEV_CONFIG;

	i = pcmcia_get_configuration_info(handle, &config);

	link->conf.Vcc = config.Vcc;



	/* First pass: look for a config entry that looks normal. */

	tuple.TupleData = (cisdata_t *)buf;
@@ -764,7 +760,7 @@ static void bt3c_config(dev_link_t *link) 
			if (i != CS_SUCCESS)

				goto next_entry;

			if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))

				link->conf.Vpp1 = link->conf.Vpp2 = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

				link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

			if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) {

				link->conf.ConfigIndex = cf->index;

				link->io.BasePort1 = cf->io.win[0].base;

drivers/bluetooth/btuart_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -598,7 +598,6 @@ static int btuart_attach(struct pcmcia_device *p_dev) 
	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.Vcc = 50;

	link->conf.IntType = INT_MEMORY_AND_IO;



	link->handle = p_dev;
@@ -656,7 +655,6 @@ static void btuart_config(dev_link_t *link) 
	u_short buf[256];

	cisparse_t parse;

	cistpl_cftable_entry_t *cf = &parse.cftable_entry;

	config_info_t config;

	int i, j, try, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;
@@ -676,8 +674,6 @@ static void btuart_config(dev_link_t *link) 


	/* Configure card */

	link->state |= DEV_CONFIG;

	i = pcmcia_get_configuration_info(handle, &config);

	link->conf.Vcc = config.Vcc;



	/* First pass: look for a config entry that looks normal. */

	tuple.TupleData = (cisdata_t *) buf;
@@ -692,7 +688,7 @@ static void btuart_config(dev_link_t *link) 
			if (i != CS_SUCCESS)

				goto next_entry;

			if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))

				link->conf.Vpp1 = link->conf.Vpp2 = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

				link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;

			if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) {

				link->conf.ConfigIndex = cf->index;

				link->io.BasePort1 = cf->io.win[0].base;

drivers/bluetooth/dtl1_cs.c

+0 −4
Original line number Diff line number Diff line
@@ -577,7 +577,6 @@ static int dtl1_attach(struct pcmcia_device *p_dev) 
	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.Vcc = 50;

	link->conf.IntType = INT_MEMORY_AND_IO;



	link->handle = p_dev;
@@ -634,7 +633,6 @@ static void dtl1_config(dev_link_t *link) 
	u_short buf[256];

	cisparse_t parse;

	cistpl_cftable_entry_t *cf = &parse.cftable_entry;

	config_info_t config;

	int i, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;
@@ -654,8 +652,6 @@ static void dtl1_config(dev_link_t *link) 


	/* Configure card */

	link->state |= DEV_CONFIG;

	i = pcmcia_get_configuration_info(handle, &config);

	link->conf.Vcc = config.Vcc;



	tuple.TupleData = (cisdata_t *)buf;

	tuple.TupleOffset = 0;

drivers/char/pcmcia/cm4000_cs.c

+0 −7
Original line number Diff line number Diff line
@@ -1765,7 +1765,6 @@ static void cm4000_config(dev_link_t * link, int devno) 
	struct cm4000_dev *dev;

	tuple_t tuple;

	cisparse_t parse;

	config_info_t conf;

	u_char buf[64];

	int fail_fn, fail_rc;

	int rc;
@@ -1790,16 +1789,10 @@ static void cm4000_config(dev_link_t * link, int devno) 
		fail_fn = ParseTuple;

		goto cs_failed;

	}

	if ((fail_rc =

	     pcmcia_get_configuration_info(handle, &conf)) != CS_SUCCESS) {

		fail_fn = GetConfigurationInfo;

		goto cs_failed;

	}



	link->state |= DEV_CONFIG;

	link->conf.ConfigBase = parse.config.base;

	link->conf.Present = parse.config.rmask[0];

	link->conf.Vcc = conf.Vcc;



	link->io.BasePort2 = 0;

	link->io.NumPorts2 = 0;