Skip to content

Commit

Permalink
[PATCH] pcmcia: remove unneeded Vcc pseudo setting
Browse files Browse the repository at this point in the history 
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: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Dominik Brodowski committed Mar 31, 2006
1 parent 4bbed52 commit 70294b4
Show file tree
Hide file tree
Showing 46 changed files with 64 additions and 207 deletions.
4 changes: 0 additions & 4 deletions drivers/bluetooth/bluecard_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions drivers/bluetooth/bt3c_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions drivers/bluetooth/btuart_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions drivers/bluetooth/dtl1_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions drivers/char/pcmcia/cm4000_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions drivers/char/pcmcia/cm4040_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,6 @@ static void reader_config(dev_link_t *link, int devno)
struct reader_dev *dev;
tuple_t tuple;
cisparse_t parse;
config_info_t conf;
u_char buf[64];
int fail_fn, fail_rc;
int rc;
Expand All @@ -546,16 +545,10 @@ static void reader_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;
Expand Down
7 changes: 0 additions & 7 deletions drivers/char/pcmcia/synclink_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,6 @@ static int mgslpc_attach(struct pcmcia_device *p_dev)
link->irq.Handler = NULL;

link->conf.Attributes = 0;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;

link->handle = p_dev;
Expand Down Expand Up @@ -604,7 +603,6 @@ static void mgslpc_config(dev_link_t *link)
cisparse_t parse;
int last_fn, last_ret;
u_char buf[64];
config_info_t conf;
cistpl_cftable_entry_t dflt = { 0 };
cistpl_cftable_entry_t *cfg;

Expand All @@ -626,10 +624,6 @@ static void mgslpc_config(dev_link_t *link)
/* Configure card */
link->state |= DEV_CONFIG;

/* Look up the current Vcc */
CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
link->conf.Vcc = conf.Vcc;

/* get CIS configuration entry */

tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
Expand Down Expand Up @@ -662,7 +656,6 @@ static void mgslpc_config(dev_link_t *link)
}

link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 8;
link->conf.Present = PRESENT_OPTION;
Expand Down
11 changes: 4 additions & 7 deletions drivers/ide/legacy/ide-cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ static int ide_attach(struct pcmcia_device *p_dev)
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
link->irq.IRQInfo1 = IRQ_LEVEL_ID;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;

link->handle = p_dev;
Expand Down Expand Up @@ -222,7 +221,6 @@ static void ide_config(dev_link_t *link)

/* Not sure if this is right... look up the current Vcc */
CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &stk->conf));
link->conf.Vcc = stk->conf.Vcc;

pass = io_base = ctl_base = 0;
tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
Expand All @@ -244,10 +242,10 @@ static void ide_config(dev_link_t *link)
}

if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
link->conf.Vpp1 = link->conf.Vpp2 =
link->conf.Vpp =
cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
else if (stk->dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
link->conf.Vpp1 = link->conf.Vpp2 =
link->conf.Vpp =
stk->dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;

if ((cfg->io.nwin > 0) || (stk->dflt.io.nwin > 0)) {
Expand Down Expand Up @@ -329,9 +327,8 @@ static void ide_config(dev_link_t *link)
info->node.minor = 0;
info->hd = hd;
link->dev = &info->node;
printk(KERN_INFO "ide-cs: %s: Vcc = %d.%d, Vpp = %d.%d\n",
info->node.dev_name, link->conf.Vcc / 10, link->conf.Vcc % 10,
link->conf.Vpp1 / 10, link->conf.Vpp1 % 10);
printk(KERN_INFO "ide-cs: %s: Vpp = %d.%d\n",
info->node.dev_name, link->conf.Vpp / 10, link->conf.Vpp % 10);

link->state &= ~DEV_CONFIG_PENDING;
kfree(stk);
Expand Down
1 change: 0 additions & 1 deletion drivers/isdn/hardware/avm/avm_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ static int avmcs_attach(struct pcmcia_device *p_dev)

/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
link->conf.Present = PRESENT_OPTION;
Expand Down
1 change: 0 additions & 1 deletion drivers/isdn/hisax/avma1_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ static int avma1cs_attach(struct pcmcia_device *p_dev)

/* General socket configuration */
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
link->conf.Present = PRESENT_OPTION;
Expand Down
8 changes: 2 additions & 6 deletions drivers/isdn/hisax/elsa_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ static int elsa_cs_attach(struct pcmcia_device *p_dev)
link->io.IOAddrLines = 3;

link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;

link->handle = p_dev;
Expand Down Expand Up @@ -324,11 +323,8 @@ static void elsa_cs_config(dev_link_t *link)
link->dev = &dev->node;

/* Finally, report what we've done */
printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
dev->node.dev_name, link->conf.ConfigIndex,
link->conf.Vcc/10, link->conf.Vcc%10);
if (link->conf.Vpp1)
printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
printk(KERN_INFO "%s: index 0x%02x: ",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
printk(", irq %d", link->irq.AssignedIRQ);
if (link->io.NumPorts1)
Expand Down
16 changes: 6 additions & 10 deletions drivers/isdn/hisax/sedlbauer_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ static int sedlbauer_attach(struct pcmcia_device *p_dev)


link->conf.Attributes = 0;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;

link->handle = p_dev;
Expand Down Expand Up @@ -263,9 +262,7 @@ static void sedlbauer_config(dev_link_t *link)
/* Configure card */
link->state |= DEV_CONFIG;

/* Look up the current Vcc */
CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
link->conf.Vcc = conf.Vcc;

/*
In this loop, we scan the CIS for configuration table entries,
Expand Down Expand Up @@ -309,10 +306,10 @@ static void sedlbauer_config(dev_link_t *link)
}

if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
link->conf.Vpp1 = link->conf.Vpp2 =
link->conf.Vpp =
cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
else if (dflt.vpp1.present & (1<<CISTPL_POWER_VNOM))
link->conf.Vpp1 = link->conf.Vpp2 =
link->conf.Vpp =
dflt.vpp1.param[CISTPL_POWER_VNOM]/10000;

/* Do we need to allocate an interrupt? */
Expand Down Expand Up @@ -403,11 +400,10 @@ static void sedlbauer_config(dev_link_t *link)
link->dev = &dev->node;

/* Finally, report what we've done */
printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
dev->node.dev_name, link->conf.ConfigIndex,
link->conf.Vcc/10, link->conf.Vcc%10);
if (link->conf.Vpp1)
printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
printk(KERN_INFO "%s: index 0x%02x:",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Vpp)
printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
printk(", irq %d", link->irq.AssignedIRQ);
if (link->io.NumPorts1)
Expand Down
8 changes: 2 additions & 6 deletions drivers/isdn/hisax/teles_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ static int teles_attach(struct pcmcia_device *p_dev)
link->io.IOAddrLines = 5;

link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;

link->handle = p_dev;
Expand Down Expand Up @@ -315,11 +314,8 @@ static void teles_cs_config(dev_link_t *link)
link->dev = &dev->node;

/* Finally, report what we've done */
printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
dev->node.dev_name, link->conf.ConfigIndex,
link->conf.Vcc/10, link->conf.Vcc%10);
if (link->conf.Vpp1)
printk(", Vpp %d.%d", link->conf.Vpp1/10, link->conf.Vpp1%10);
printk(KERN_INFO "%s: index 0x%02x:",
dev->node.dev_name, link->conf.ConfigIndex);
if (link->conf.Attributes & CONF_ENABLE_IRQ)
printk(", irq %d", link->irq.AssignedIRQ);
if (link->io.NumPorts1)
Expand Down
7 changes: 2 additions & 5 deletions drivers/mtd/maps/pcmciamtd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,13 +587,10 @@ static void pcmciamtd_config(dev_link_t *link)
DEBUG(2, "Vcc = %d Vpp1 = %d Vpp2 = %d", t.Vcc, t.Vpp1, t.Vpp2);
dev->vpp = (vpp) ? vpp : t.Vpp1;
link->conf.Attributes = 0;
link->conf.Vcc = t.Vcc;
if(setvpp == 2) {
link->conf.Vpp1 = dev->vpp;
link->conf.Vpp2 = dev->vpp;
link->conf.Vpp = dev->vpp;
} else {
link->conf.Vpp1 = 0;
link->conf.Vpp2 = 0;
link->conf.Vpp = 0;
}

link->conf.IntType = INT_MEMORY;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/pcmcia/3c574_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ static int tc574_attach(struct pcmcia_device *p_dev)
link->irq.Handler = &el3_interrupt;
link->irq.Instance = dev;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
link->conf.Present = PRESENT_OPTION;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/pcmcia/3c589_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ static int tc589_attach(struct pcmcia_device *p_dev)
link->irq.Handler = &el3_interrupt;
link->irq.Instance = dev;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
link->conf.Present = PRESENT_OPTION;
Expand Down
Loading

0 comments on commit 70294b4

Please sign in to comment.