Commit ffce2e7e authored by Pierre Ossman's avatar Pierre Ossman

mmc: move layer init and workqueue to core file

Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent b93931a6
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
#include <linux/mmc/sd.h> #include <linux/mmc/sd.h>
#include "core.h" #include "core.h"
#include "sysfs.h" #include "bus.h"
#include "host.h"
#include "mmc_ops.h" #include "mmc_ops.h"
#include "sd_ops.h" #include "sd_ops.h"
...@@ -35,6 +36,25 @@ ...@@ -35,6 +36,25 @@
extern int mmc_attach_mmc(struct mmc_host *host, u32 ocr); extern int mmc_attach_mmc(struct mmc_host *host, u32 ocr);
extern int mmc_attach_sd(struct mmc_host *host, u32 ocr); extern int mmc_attach_sd(struct mmc_host *host, u32 ocr);
static struct workqueue_struct *workqueue;
/*
* Internal function. Schedule delayed work in the MMC work queue.
*/
static 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.
*/
static void mmc_flush_scheduled_work(void)
{
flush_workqueue(workqueue);
}
/** /**
* mmc_request_done - finish processing an MMC request * mmc_request_done - finish processing an MMC request
* @host: MMC host which completed request * @host: MMC host which completed request
...@@ -638,4 +658,31 @@ EXPORT_SYMBOL(mmc_resume_host); ...@@ -638,4 +658,31 @@ EXPORT_SYMBOL(mmc_resume_host);
#endif #endif
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);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -10,17 +10,10 @@ ...@@ -10,17 +10,10 @@
* *
* MMC sysfs/driver model support. * MMC sysfs/driver model support.
*/ */
#include <linux/module.h>
#include <linux/init.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/idr.h>
#include <linux/workqueue.h>
#include <linux/mmc/card.h> #include <linux/mmc/card.h>
#include <linux/mmc/host.h>
#include "bus.h"
#include "host.h"
#include "sysfs.h" #include "sysfs.h"
int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs) 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) ...@@ -48,47 +41,3 @@ void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs)
device_remove_file(&card->dev, &attrs[i]); 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);
...@@ -23,8 +23,4 @@ static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *a ...@@ -23,8 +23,4 @@ static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *a
int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs); int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs);
void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs); void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs);
int mmc_schedule_work(struct work_struct *work);
int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay);
void mmc_flush_scheduled_work(void);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment