[PATCH] pcmcia: remove export of pcmcia_release_configuration

Handle the _modifying_ operation sm91c92_cs requires in
pcmcia_modify_configuration, so that the only remaining users
of pcmcia_release_configuration() are within the pcmcia core
module.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

2 files changed, 24 insertions, 1 deletions

diff --git a/drivers/pcmcia/ds_internal.h b/drivers/pcmcia/ds_internal.h
index 783d8617a05c..3a2b25e6ed73 100644
--- a/drivers/pcmcia/ds_internal.h
+++ b/drivers/pcmcia/ds_internal.h
@@ -8,6 +8,8 @@ extern void pcmcia_put_dev(struct pcmcia_device *p_dev);
 
 struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function);
 
+extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
+
 #ifdef CONFIG_PCMCIA_IOCTL
 extern void __init pcmcia_setup_ioctl(void);
 extern void __exit pcmcia_cleanup_ioctl(void);
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index f4dcea6ac44b..16504f852af2 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -442,6 +442,28 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
                    (mod->Attributes & CONF_VPP2_CHANGE_VALID))
                 return CS_BAD_VPP;
 
+        if (mod->Attributes & CONF_IO_CHANGE_WIDTH) {
+                pccard_io_map io_off = { 0, 0, 0, 0, 1 };
+                pccard_io_map io_on;
+                int i;
+
+                io_on.speed = io_speed;
+                for (i = 0; i < MAX_IO_WIN; i++) {
+                        if (!s->io[i].res)
+                                continue;
+                        io_off.map = i;
+                        io_on.map = i;
+
+                        io_on.flags = MAP_ACTIVE | IO_DATA_PATH_WIDTH_8;
+                        io_on.start = s->io[i].res->start;
+                        io_on.stop = s->io[i].res->end;
+
+                        s->ops->set_io_map(s, &io_off);
+                        mdelay(40);
+                        s->ops->set_io_map(s, &io_on);
+                }
+        }
+
         return CS_SUCCESS;
 } /* modify_configuration */
 EXPORT_SYMBOL(pcmcia_modify_configuration);
@@ -479,7 +501,6 @@ int pcmcia_release_configuration(struct pcmcia_device *p_dev)
 
         return CS_SUCCESS;
 } /* pcmcia_release_configuration */
-EXPORT_SYMBOL(pcmcia_release_configuration);
 
 
 /** pcmcia_release_io