1 files changed, 182 insertions, 123 deletions

diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index 6b10ebe9d93..d195fb088f4 100644
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -14,71 +14,124 @@
 #include <linux/idr.h>
 
 #define DRIVER_NAME "tifm_core"
-#define DRIVER_VERSION "0.7"
+#define DRIVER_VERSION "0.8"
 
+static struct workqueue_struct *workqueue;
 static DEFINE_IDR(tifm_adapter_idr);
 static DEFINE_SPINLOCK(tifm_adapter_lock);
 
-static tifm_media_id *tifm_device_match(tifm_media_id *ids,
-                        struct tifm_dev *dev)
+static const char *tifm_media_type_name(unsigned char type, unsigned char nt)
 {
-        while (*ids) {
-                if (dev->media_id == *ids)
-                        return ids;
-                ids++;
-        }
-        return NULL;
+        const char *card_type_name[3][3] = {
+                { "SmartMedia/xD", "MemoryStick", "MMC/SD" },
+                { "XD", "MS", "SD"},
+                { "xd", "ms", "sd"}
+        };
+
+        if (nt > 2 || type < 1 || type > 3)
+                return NULL;
+        return card_type_name[nt][type - 1];
 }
 
-static int tifm_match(struct device *dev, struct device_driver *drv)
+static int tifm_dev_match(struct tifm_dev *sock, struct tifm_device_id *id)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *fm_drv;
-
-        fm_drv = container_of(drv, struct tifm_driver, driver);
-        if (!fm_drv->id_table)
-                return -EINVAL;
-        if (tifm_device_match(fm_drv->id_table, fm_dev))
+        if (sock->type == id->type)
                 return 1;
-        return -ENODEV;
+        return 0;
+}
+
+static int tifm_bus_match(struct device *dev, struct device_driver *drv)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *fm_drv = container_of(drv, struct tifm_driver,
+                                                  driver);
+        struct tifm_device_id *ids = fm_drv->id_table;
+
+        if (ids) {
+                while (ids->type) {
+                        if (tifm_dev_match(sock, ids))
+                                return 1;
+                        ++ids;
+                }
+        }
+        return 0;
 }
 
 static int tifm_uevent(struct device *dev, char **envp, int num_envp,
                        char *buffer, int buffer_size)
 {
-        struct tifm_dev *fm_dev;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
         int i = 0;
         int length = 0;
-        const char *card_type_name[] = {"INV", "SM", "MS", "SD"};
 
-        if (!dev || !(fm_dev = container_of(dev, struct tifm_dev, dev)))
-                return -ENODEV;
         if (add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-                        "TIFM_CARD_TYPE=%s", card_type_name[fm_dev->media_id]))
+                           "TIFM_CARD_TYPE=%s",
+                           tifm_media_type_name(sock->type, 1)))
                 return -ENOMEM;
 
         return 0;
 }
 
+static int tifm_device_probe(struct device *dev)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
+        int rc = -ENODEV;
+
+        get_device(dev);
+        if (dev->driver && drv->probe) {
+                rc = drv->probe(sock);
+                if (!rc)
+                        return 0;
+        }
+        put_device(dev);
+        return rc;
+}
+
+static void tifm_dummy_event(struct tifm_dev *sock)
+{
+        return;
+}
+
+static int tifm_device_remove(struct device *dev)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
+
+        if (dev->driver && drv->remove) {
+                sock->card_event = tifm_dummy_event;
+                sock->data_event = tifm_dummy_event;
+                drv->remove(sock);
+                sock->dev.driver = NULL;
+        }
+
+        put_device(dev);
+        return 0;
+}
+
 #ifdef CONFIG_PM
 
 static int tifm_device_suspend(struct device *dev, pm_message_t state)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *drv = fm_dev->drv;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
 
-        if (drv && drv->suspend)
-                return drv->suspend(fm_dev, state);
+        if (dev->driver && drv->suspend)
+                return drv->suspend(sock, state);
         return 0;
 }
 
 static int tifm_device_resume(struct device *dev)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *drv = fm_dev->drv;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
+                                               driver);
 
-        if (drv && drv->resume)
-                return drv->resume(fm_dev);
+        if (dev->driver && drv->resume)
+                return drv->resume(sock);
         return 0;
 }
 
@@ -89,19 +142,33 @@ static int tifm_device_resume(struct device *dev)
 
 #endif /* CONFIG_PM */
 
+static ssize_t type_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        return sprintf(buf, "%x", sock->type);
+}
+
+static struct device_attribute tifm_dev_attrs[] = {
+        __ATTR(type, S_IRUGO, type_show, NULL),
+        __ATTR_NULL
+};
+
 static struct bus_type tifm_bus_type = {
-        .name    = "tifm",
-        .match   = tifm_match,
-        .uevent  = tifm_uevent,
-        .suspend = tifm_device_suspend,
-        .resume  = tifm_device_resume
+        .name      = "tifm",
+        .dev_attrs = tifm_dev_attrs,
+        .match     = tifm_bus_match,
+        .uevent    = tifm_uevent,
+        .probe     = tifm_device_probe,
+        .remove    = tifm_device_remove,
+        .suspend   = tifm_device_suspend,
+        .resume    = tifm_device_resume
 };
 
 static void tifm_free(struct class_device *cdev)
 {
         struct tifm_adapter *fm = container_of(cdev, struct tifm_adapter, cdev);
 
-        kfree(fm->sockets);
         kfree(fm);
 }
 
@@ -110,28 +177,25 @@ static struct class tifm_adapter_class = {
         .release = tifm_free
 };
 
-struct tifm_adapter *tifm_alloc_adapter(void)
+struct tifm_adapter *tifm_alloc_adapter(unsigned int num_sockets,
+                                        struct device *dev)
 {
         struct tifm_adapter *fm;
 
-        fm = kzalloc(sizeof(struct tifm_adapter), GFP_KERNEL);
+        fm = kzalloc(sizeof(struct tifm_adapter)
+                     + sizeof(struct tifm_dev*) * num_sockets, GFP_KERNEL);
         if (fm) {
                 fm->cdev.class = &tifm_adapter_class;
-                spin_lock_init(&fm->lock);
+                fm->cdev.dev = dev;
                 class_device_initialize(&fm->cdev);
+                spin_lock_init(&fm->lock);
+                fm->num_sockets = num_sockets;
         }
         return fm;
 }
 EXPORT_SYMBOL(tifm_alloc_adapter);
 
-void tifm_free_adapter(struct tifm_adapter *fm)
-{
-        class_device_put(&fm->cdev);
-}
-EXPORT_SYMBOL(tifm_free_adapter);
-
-int tifm_add_adapter(struct tifm_adapter *fm,
-                     int (*mediathreadfn)(void *data))
+int tifm_add_adapter(struct tifm_adapter *fm)
 {
         int rc;
 
@@ -141,59 +205,80 @@ int tifm_add_adapter(struct tifm_adapter *fm,
         spin_lock(&tifm_adapter_lock);
         rc = idr_get_new(&tifm_adapter_idr, fm, &fm->id);
         spin_unlock(&tifm_adapter_lock);
-        if (!rc) {
-                snprintf(fm->cdev.class_id, BUS_ID_SIZE, "tifm%u", fm->id);
-                fm->media_switcher = kthread_create(mediathreadfn,
-                                                    fm, "tifm/%u", fm->id);
-
-                if (!IS_ERR(fm->media_switcher))
-                        return class_device_add(&fm->cdev);
+        if (rc)
+                return rc;
 
+        snprintf(fm->cdev.class_id, BUS_ID_SIZE, "tifm%u", fm->id);
+        rc = class_device_add(&fm->cdev);
+        if (rc) {
                 spin_lock(&tifm_adapter_lock);
                 idr_remove(&tifm_adapter_idr, fm->id);
                 spin_unlock(&tifm_adapter_lock);
-                rc = -ENOMEM;
         }
+
         return rc;
 }
 EXPORT_SYMBOL(tifm_add_adapter);
 
 void tifm_remove_adapter(struct tifm_adapter *fm)
 {
-        class_device_del(&fm->cdev);
+        unsigned int cnt;
+
+        flush_workqueue(workqueue);
+        for (cnt = 0; cnt < fm->num_sockets; ++cnt) {
+                if (fm->sockets[cnt])
+                        device_unregister(&fm->sockets[cnt]->dev);
+        }
 
         spin_lock(&tifm_adapter_lock);
         idr_remove(&tifm_adapter_idr, fm->id);
         spin_unlock(&tifm_adapter_lock);
+        class_device_del(&fm->cdev);
 }
 EXPORT_SYMBOL(tifm_remove_adapter);
 
-void tifm_free_device(struct device *dev)
+void tifm_free_adapter(struct tifm_adapter *fm)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        kfree(fm_dev);
+        class_device_put(&fm->cdev);
 }
-EXPORT_SYMBOL(tifm_free_device);
+EXPORT_SYMBOL(tifm_free_adapter);
 
-static void tifm_dummy_signal_irq(struct tifm_dev *sock,
-                                  unsigned int sock_irq_status)
+void tifm_free_device(struct device *dev)
 {
-        return;
+        struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
+        kfree(sock);
 }
+EXPORT_SYMBOL(tifm_free_device);
 
-struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm)
+struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id,
+                                   unsigned char type)
 {
-        struct tifm_dev *dev = kzalloc(sizeof(struct tifm_dev), GFP_KERNEL);
-
-        if (dev) {
-                spin_lock_init(&dev->lock);
-
-                dev->dev.parent = fm->dev;
-                dev->dev.bus = &tifm_bus_type;
-                dev->dev.release = tifm_free_device;
-                dev->signal_irq = tifm_dummy_signal_irq;
+        struct tifm_dev *sock = NULL;
+
+        if (!tifm_media_type_name(type, 0))
+                return sock;
+
+        sock = kzalloc(sizeof(struct tifm_dev), GFP_KERNEL);
+        if (sock) {
+                spin_lock_init(&sock->lock);
+                sock->type = type;
+                sock->socket_id = id;
+                sock->card_event = tifm_dummy_event;
+                sock->data_event = tifm_dummy_event;
+
+                sock->dev.parent = fm->cdev.dev;
+                sock->dev.bus = &tifm_bus_type;
+                sock->dev.dma_mask = fm->cdev.dev->dma_mask;
+                sock->dev.release = tifm_free_device;
+
+                snprintf(sock->dev.bus_id, BUS_ID_SIZE,
+                         "tifm_%s%u:%u", tifm_media_type_name(type, 2),
+                         fm->id, id);
+                printk(KERN_INFO DRIVER_NAME
+                       ": %s card detected in socket %u:%u\n",
+                       tifm_media_type_name(type, 0), fm->id, id);
         }
-        return dev;
+        return sock;
 }
 EXPORT_SYMBOL(tifm_alloc_device);
 
@@ -218,54 +303,15 @@ void tifm_unmap_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,
 }
 EXPORT_SYMBOL(tifm_unmap_sg);
 
-static int tifm_device_probe(struct device *dev)
-{
-        struct tifm_driver *drv;
-        struct tifm_dev *fm_dev;
-        int rc = 0;
-        const tifm_media_id *id;
-
-        drv = container_of(dev->driver, struct tifm_driver, driver);
-        fm_dev = container_of(dev, struct tifm_dev, dev);
-        get_device(dev);
-        if (!fm_dev->drv && drv->probe && drv->id_table) {
-                rc = -ENODEV;
-                id = tifm_device_match(drv->id_table, fm_dev);
-                if (id)
-                        rc = drv->probe(fm_dev);
-                if (rc >= 0) {
-                        rc = 0;
-                        fm_dev->drv = drv;
-                }
-        }
-        if (rc)
-                put_device(dev);
-        return rc;
-}
-
-static int tifm_device_remove(struct device *dev)
+void tifm_queue_work(struct work_struct *work)
 {
-        struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        struct tifm_driver *drv = fm_dev->drv;
-
-        if (drv) {
-                fm_dev->signal_irq = tifm_dummy_signal_irq;
-                if (drv->remove)
-                        drv->remove(fm_dev);
-                fm_dev->drv = NULL;
-        }
-
-        put_device(dev);
-        return 0;
+        queue_work(workqueue, work);
 }
+EXPORT_SYMBOL(tifm_queue_work);
 
 int tifm_register_driver(struct tifm_driver *drv)
 {
         drv->driver.bus = &tifm_bus_type;
-        drv->driver.probe = tifm_device_probe;
-        drv->driver.remove = tifm_device_remove;
-        drv->driver.suspend = tifm_device_suspend;
-        drv->driver.resume = tifm_device_resume;
 
         return driver_register(&drv->driver);
 }
@@ -279,13 +325,25 @@ EXPORT_SYMBOL(tifm_unregister_driver);
 
 static int __init tifm_init(void)
 {
-        int rc = bus_register(&tifm_bus_type);
+        int rc;
 
-        if (!rc) {
-                rc = class_register(&tifm_adapter_class);
-                if (rc)
-                        bus_unregister(&tifm_bus_type);
-        }
+        workqueue = create_freezeable_workqueue("tifm");
+        if (!workqueue)
+                return -ENOMEM;
+
+        rc = bus_register(&tifm_bus_type);
+
+        if (rc)
+                goto err_out_wq;
+
+        rc = class_register(&tifm_adapter_class);
+        if (!rc)
+                return 0;
+
+        bus_unregister(&tifm_bus_type);
+
+err_out_wq:
+        destroy_workqueue(workqueue);
 
         return rc;
 }
@@ -294,6 +352,7 @@ static void __exit tifm_exit(void)
 {
         class_unregister(&tifm_adapter_class);
         bus_unregister(&tifm_bus_type);
+        destroy_workqueue(workqueue);
 }
 
 subsys_initcall(tifm_init);