[PATCH] pcmcia: remove unneeded Vcc pseudo setting

[safe/jmp/linux-2.6] / drivers / telephony / ixj_pcmcia.c

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index fe3cde0..de794b2 100644 (file)
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -51,7 +51,6 @@ static int ixj_attach(struct pcmcia_device *p_dev)
        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
        link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
        link->io.IOAddrLines = 3;
-       link->conf.Vcc = 50;
        link->conf.IntType = INT_MEMORY_AND_IO;
        link->priv = kmalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
        if (!link->priv) {
@@ -157,7 +156,6 @@ static void ixj_config(dev_link_t * link)
        tuple_t tuple;
        u_short buf[128];
        cisparse_t parse;
-       config_info_t conf;
        cistpl_cftable_entry_t *cfg = &parse.cftable_entry;
        cistpl_cftable_entry_t dflt =
        {
@@ -178,7 +176,6 @@ static void ixj_config(dev_link_t * link)
        link->conf.ConfigBase = parse.config.base;
        link->conf.Present = parse.config.rmask[0];
        link->state |= DEV_CONFIG;
-       CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
        tuple.Attributes = 0;
        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
@@ -232,28 +229,6 @@ static void ixj_cs_release(dev_link_t *link)
        pcmcia_disable_device(link->handle);
 }
 
-static int ixj_suspend(struct pcmcia_device *dev)
-{
-       dev_link_t *link = dev_to_instance(dev);
-
-       link->state |= DEV_SUSPEND;
-       if (link->state & DEV_CONFIG)
-               pcmcia_release_configuration(link->handle);
-
-       return 0;
-}
-
-static int ixj_resume(struct pcmcia_device *dev)
-{
-       dev_link_t *link = dev_to_instance(dev);
-
-       link->state &= ~DEV_SUSPEND;
-       if (DEV_OK(link))
-               pcmcia_request_configuration(link->handle, &link->conf);
-
-       return 0;
-}
-
 static struct pcmcia_device_id ixj_ids[] = {
        PCMCIA_DEVICE_MANF_CARD(0x0257, 0x0600),
        PCMCIA_DEVICE_NULL
@@ -268,8 +243,6 @@ static struct pcmcia_driver ixj_driver = {
        .probe          = ixj_attach,
        .remove         = ixj_detach,
        .id_table       = ixj_ids,
-       .suspend        = ixj_suspend,
-       .resume         = ixj_resume,
 };
 
 static int __init ixj_pcmcia_init(void)