Merge branch 'for-2.6.25' of git://git.kernel.dk/linux-2.6-block

[~andy/linux] / drivers / mmc / core / sysfs.c

diff --git a/drivers/mmc/core/sysfs.c b/drivers/mmc/core/sysfs.c
index fbf99f9a0b83ad7ae6efd2a569cb8e1bc352a657..00a97e70f91425a57b1fc28628a5884ff93c285d 100644 (file)
--- a/drivers/mmc/core/sysfs.c
+++ b/drivers/mmc/core/sysfs.c
@@ -10,17 +10,10 @@
  *
  *  MMC sysfs/driver model support.
  */
-#include <linux/module.h>
-#include <linux/init.h>
 #include <linux/device.h>
-#include <linux/idr.h>
-#include <linux/workqueue.h>
 
 #include <linux/mmc/card.h>
-#include <linux/mmc/host.h>
 
-#include "bus.h"
-#include "host.h"
 #include "sysfs.h"
 
 int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs)
@@ -48,47 +41,3 @@ void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs)
                device_remove_file(&card->dev, &attrs[i]);
 }
 
-static struct workqueue_struct *workqueue;
-
-/*
- * Internal function. Schedule delayed work in the MMC work queue.
- */
-int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay)
-{
-       return queue_delayed_work(workqueue, work, delay);
-}
-
-/*
- * Internal function. Flush all scheduled work from the MMC work queue.
- */
-void mmc_flush_scheduled_work(void)
-{
-       flush_workqueue(workqueue);
-}
-
-static int __init mmc_init(void)
-{
-       int ret;
-
-       workqueue = create_singlethread_workqueue("kmmcd");
-       if (!workqueue)
-               return -ENOMEM;
-
-       ret = mmc_register_bus();
-       if (ret == 0) {
-               ret = mmc_register_host_class();
-               if (ret)
-                       mmc_unregister_bus();
-       }
-       return ret;
-}
-
-static void __exit mmc_exit(void)
-{
-       mmc_unregister_host_class();
-       mmc_unregister_bus();
-       destroy_workqueue(workqueue);
-}
-
-module_init(mmc_init);
-module_exit(mmc_exit);