[PATCH] pcmcia: embed dev_link_t into struct pcmcia_device

[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 57c0c6e..0afd6c0 100644 (file)
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -34,73 +34,41 @@ typedef struct ixj_info_t {
        struct ixj *port;
 } ixj_info_t;
 
-static dev_link_t *ixj_attach(void);
-static void ixj_detach(dev_link_t *);
+static void ixj_detach(struct pcmcia_device *p_dev);
 static void ixj_config(dev_link_t * link);
 static void ixj_cs_release(dev_link_t * link);
-static int ixj_event(event_t event, int priority, event_callback_args_t * args);
-static dev_info_t dev_info = "ixj_cs";
-static dev_link_t *dev_list = NULL;
 
-static dev_link_t *ixj_attach(void)
+static int ixj_attach(struct pcmcia_device *p_dev)
 {
-       client_reg_t client_reg;
-       dev_link_t *link;
-       int ret;
        DEBUG(0, "ixj_attach()\n");
        /* Create new ixj device */
-       link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-       if (!link)
-               return NULL;
-       memset(link, 0, sizeof(struct dev_link_t));
-       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) {
-               kfree(link);
-               return NULL;
+       p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+       p_dev->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
+       p_dev->io.IOAddrLines = 3;
+       p_dev->conf.IntType = INT_MEMORY_AND_IO;
+       p_dev->priv = kmalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
+       if (!p_dev->priv) {
+               return -ENOMEM;
        }
-       memset(link->priv, 0, sizeof(struct ixj_info_t));
-       /* Register with Card Services */
-       link->next = dev_list;
-       dev_list = link;
-       client_reg.dev_info = &dev_info;
-       client_reg.Version = 0x0210;
-       client_reg.event_callback_args.client_data = link;
-       ret = pcmcia_register_client(&link->handle, &client_reg);
-       if (ret != CS_SUCCESS) {
-               cs_error(link->handle, RegisterClient, ret);
-               ixj_detach(link);
-               return NULL;
-       }
-       return link;
+       memset(p_dev->priv, 0, sizeof(struct ixj_info_t));
+
+       p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+       ixj_config(p_dev);
+
+       return 0;
 }
 
-static void ixj_detach(dev_link_t * link)
+static void ixj_detach(struct pcmcia_device *p_dev)
 {
-       dev_link_t **linkp;
-       int ret;
+       dev_link_t *link = dev_to_instance(p_dev);
+
        DEBUG(0, "ixj_detach(0x%p)\n", link);
-       for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
-               if (*linkp == link)
-                       break;
-       if (*linkp == NULL)
-               return;
+
        link->state &= ~DEV_RELEASE_PENDING;
        if (link->state & DEV_CONFIG)
                ixj_cs_release(link);
-       if (link->handle) {
-               ret = pcmcia_deregister_client(link->handle);
-               if (ret != CS_SUCCESS)
-                       cs_error(link->handle, DeregisterClient, ret);
-       }
-       /* Unlink device structure, free bits */
-       *linkp = link->next;
+
         kfree(link->priv);
-        kfree(link);
 }
 
 #define CS_CHECK(fn, ret) \
@@ -177,7 +145,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 =
        {
@@ -198,7 +165,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));
@@ -235,7 +201,7 @@ static void ixj_config(dev_link_t * link)
 
        info->ndev = 1;
        info->node.major = PHONE_MAJOR;
-       link->dev = &info->node;
+       link->dev_node = &info->node;
        ixj_get_serial(link, j);
        link->state &= ~DEV_CONFIG_PENDING;
        return;
@@ -249,44 +215,7 @@ static void ixj_cs_release(dev_link_t *link)
        ixj_info_t *info = link->priv;
        DEBUG(0, "ixj_cs_release(0x%p)\n", link);
        info->ndev = 0;
-       link->dev = NULL;
-       pcmcia_release_configuration(link->handle);
-       pcmcia_release_io(link->handle, &link->io);
-       link->state &= ~DEV_CONFIG;
-}
-
-static int ixj_event(event_t event, int priority, event_callback_args_t * args)
-{
-       dev_link_t *link = args->client_data;
-       DEBUG(1, "ixj_event(0x%06x)\n", event);
-       switch (event) {
-       case CS_EVENT_CARD_REMOVAL:
-               link->state &= ~DEV_PRESENT;
-               if (link->state & DEV_CONFIG) {
-                       link->state |= DEV_RELEASE_PENDING;
-                       ixj_cs_release(link);
-               }
-               break;
-       case CS_EVENT_CARD_INSERTION:
-               link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-               ixj_config(link);
-               break;
-       case CS_EVENT_PM_SUSPEND:
-               link->state |= DEV_SUSPEND;
-               /* Fall through... */
-       case CS_EVENT_RESET_PHYSICAL:
-               if (link->state & DEV_CONFIG)
-                       pcmcia_release_configuration(link->handle);
-               break;
-       case CS_EVENT_PM_RESUME:
-               link->state &= ~DEV_SUSPEND;
-               /* Fall through... */
-       case CS_EVENT_CARD_RESET:
-               if (DEV_OK(link))
-                       pcmcia_request_configuration(link->handle, &link->conf);
-               break;
-       }
-       return 0;
+       pcmcia_disable_device(link->handle);
 }
 
 static struct pcmcia_device_id ixj_ids[] = {
@@ -300,9 +229,8 @@ static struct pcmcia_driver ixj_driver = {
        .drv            = {
                .name   = "ixj_cs",
        },
-       .attach         = ixj_attach,
-       .event          = ixj_event,
-       .detach         = ixj_detach,
+       .probe          = ixj_attach,
+       .remove         = ixj_detach,
        .id_table       = ixj_ids,
 };
 
@@ -314,7 +242,6 @@ static int __init ixj_pcmcia_init(void)
 static void ixj_pcmcia_exit(void)
 {
        pcmcia_unregister_driver(&ixj_driver);
-       BUG_ON(dev_list != NULL);
 }
 
 module_init(ixj_pcmcia_init);