Merge branch 'fix/asoc' into for-linus

4 files changed, 13 insertions, 20 deletions

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 7ab9174a8a84..8cc4733698a0 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -142,10 +142,9 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
         link->resource[0]->end = 16;
 
-        link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-        link->conf.ConfigIndex = 1;
-        link->conf.Present = PRESENT_OPTION;
+        link->config_flags = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
+        link->config_index = 1;
+        link->config_regs = PRESENT_OPTION;
 
         return pdacf_config(link);
 }
@@ -217,7 +216,8 @@ static int pdacf_config(struct pcmcia_device *link)
         int ret;
 
         snd_printdd(KERN_DEBUG "pdacf_config called\n");
-        link->conf.ConfigIndex = 0x5;
+        link->config_index = 0x5;
+        link->config_flags |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
 
         ret = pcmcia_request_io(link);
         if (ret)
@@ -227,7 +227,7 @@ static int pdacf_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        ret = pcmcia_request_configuration(link, &link->conf);
+        ret = pcmcia_enable_device(link);
         if (ret)
                 goto failed;
 
@@ -287,9 +287,7 @@ MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids);
 
 static struct pcmcia_driver pdacf_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "snd-pdaudiocf",
-        },
+        .name           = "snd-pdaudiocf",
         .probe          = snd_pdacf_probe,
         .remove         = snd_pdacf_detach,
         .id_table       = snd_pdacf_ids,
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h
index 5cc3e4573074..bd26e092aead 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h
@@ -24,7 +24,6 @@
 #include <sound/pcm.h>
 #include <asm/io.h>
 #include <linux/interrupt.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index a6edfc3be29a..80000d631f88 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -2,7 +2,7 @@
  * Driver for Digigram VXpocket V2/440 soundcards
  *
  * Copyright (c) 2002 by Takashi Iwai <tiwai@suse.de>
- *
+
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -162,10 +162,9 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl,
         link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
         link->resource[0]->end = 16;
 
-        link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-        link->conf.ConfigIndex = 1;
-        link->conf.Present = PRESENT_OPTION;
+        link->config_flags |= CONF_ENABLE_IRQ;
+        link->config_index = 1;
+        link->config_regs = PRESENT_OPTION;
 
         *chip_ret = vxp;
         return 0;
@@ -234,7 +233,7 @@ static int vxpocket_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        ret = pcmcia_request_configuration(link, &link->conf);
+        ret = pcmcia_enable_device(link);
         if (ret)
                 goto failed;
 
@@ -359,9 +358,7 @@ MODULE_DEVICE_TABLE(pcmcia, vxp_ids);
 
 static struct pcmcia_driver vxp_cs_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "snd-vxpocket",
-        },
+        .name           = "snd-vxpocket",
         .probe          = vxpocket_probe,
         .remove         = vxpocket_detach,
         .id_table       = vxp_ids,
diff --git a/sound/pcmcia/vx/vxpocket.h b/sound/pcmcia/vx/vxpocket.h
index d9110669d042..13d658c1a216 100644
--- a/sound/pcmcia/vx/vxpocket.h
+++ b/sound/pcmcia/vx/vxpocket.h
@@ -23,7 +23,6 @@
 
 #include <sound/vx_core.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>