mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
367 lines
8.2 KiB
C
367 lines
8.2 KiB
C
/*
|
|
* tifm_core.c - TI FlashMedia driver
|
|
*
|
|
* Copyright (C) 2006 Alex Dubov <oakad@yahoo.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#include <linux/tifm.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/init.h>
|
|
#include <linux/idr.h>
|
|
|
|
#define DRIVER_NAME "tifm_core"
|
|
#define DRIVER_VERSION "0.8"
|
|
|
|
static struct workqueue_struct *workqueue;
|
|
static DEFINE_IDR(tifm_adapter_idr);
|
|
static DEFINE_SPINLOCK(tifm_adapter_lock);
|
|
|
|
static const char *tifm_media_type_name(unsigned char type, unsigned char nt)
|
|
{
|
|
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_dev_match(struct tifm_dev *sock, struct tifm_device_id *id)
|
|
{
|
|
if (sock->type == id->type)
|
|
return 1;
|
|
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, struct kobj_uevent_env *env)
|
|
{
|
|
struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
|
|
|
|
if (add_uevent_var(env, "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 *sock = container_of(dev, struct tifm_dev, dev);
|
|
struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
|
|
driver);
|
|
|
|
if (dev->driver && drv->suspend)
|
|
return drv->suspend(sock, state);
|
|
return 0;
|
|
}
|
|
|
|
static int tifm_device_resume(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->resume)
|
|
return drv->resume(sock);
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
|
|
#define tifm_device_suspend NULL
|
|
#define tifm_device_resume NULL
|
|
|
|
#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",
|
|
.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 device *dev)
|
|
{
|
|
struct tifm_adapter *fm = container_of(dev, struct tifm_adapter, dev);
|
|
|
|
kfree(fm);
|
|
}
|
|
|
|
static struct class tifm_adapter_class = {
|
|
.name = "tifm_adapter",
|
|
.dev_release = tifm_free
|
|
};
|
|
|
|
struct tifm_adapter *tifm_alloc_adapter(unsigned int num_sockets,
|
|
struct device *dev)
|
|
{
|
|
struct tifm_adapter *fm;
|
|
|
|
fm = kzalloc(sizeof(struct tifm_adapter)
|
|
+ sizeof(struct tifm_dev*) * num_sockets, GFP_KERNEL);
|
|
if (fm) {
|
|
fm->dev.class = &tifm_adapter_class;
|
|
fm->dev.parent = dev;
|
|
device_initialize(&fm->dev);
|
|
spin_lock_init(&fm->lock);
|
|
fm->num_sockets = num_sockets;
|
|
}
|
|
return fm;
|
|
}
|
|
EXPORT_SYMBOL(tifm_alloc_adapter);
|
|
|
|
int tifm_add_adapter(struct tifm_adapter *fm)
|
|
{
|
|
int rc;
|
|
|
|
if (!idr_pre_get(&tifm_adapter_idr, GFP_KERNEL))
|
|
return -ENOMEM;
|
|
|
|
spin_lock(&tifm_adapter_lock);
|
|
rc = idr_get_new(&tifm_adapter_idr, fm, &fm->id);
|
|
spin_unlock(&tifm_adapter_lock);
|
|
if (rc)
|
|
return rc;
|
|
|
|
dev_set_name(&fm->dev, "tifm%u", fm->id);
|
|
rc = device_add(&fm->dev);
|
|
if (rc) {
|
|
spin_lock(&tifm_adapter_lock);
|
|
idr_remove(&tifm_adapter_idr, fm->id);
|
|
spin_unlock(&tifm_adapter_lock);
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
EXPORT_SYMBOL(tifm_add_adapter);
|
|
|
|
void tifm_remove_adapter(struct tifm_adapter *fm)
|
|
{
|
|
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);
|
|
device_del(&fm->dev);
|
|
}
|
|
EXPORT_SYMBOL(tifm_remove_adapter);
|
|
|
|
void tifm_free_adapter(struct tifm_adapter *fm)
|
|
{
|
|
put_device(&fm->dev);
|
|
}
|
|
EXPORT_SYMBOL(tifm_free_adapter);
|
|
|
|
void tifm_free_device(struct device *dev)
|
|
{
|
|
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, unsigned int id,
|
|
unsigned char type)
|
|
{
|
|
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->dev.parent;
|
|
sock->dev.bus = &tifm_bus_type;
|
|
sock->dev.dma_mask = fm->dev.parent->dma_mask;
|
|
sock->dev.release = tifm_free_device;
|
|
|
|
dev_set_name(&sock->dev, "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 sock;
|
|
}
|
|
EXPORT_SYMBOL(tifm_alloc_device);
|
|
|
|
void tifm_eject(struct tifm_dev *sock)
|
|
{
|
|
struct tifm_adapter *fm = dev_get_drvdata(sock->dev.parent);
|
|
fm->eject(fm, sock);
|
|
}
|
|
EXPORT_SYMBOL(tifm_eject);
|
|
|
|
int tifm_has_ms_pif(struct tifm_dev *sock)
|
|
{
|
|
struct tifm_adapter *fm = dev_get_drvdata(sock->dev.parent);
|
|
return fm->has_ms_pif(fm, sock);
|
|
}
|
|
EXPORT_SYMBOL(tifm_has_ms_pif);
|
|
|
|
int tifm_map_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,
|
|
int direction)
|
|
{
|
|
return pci_map_sg(to_pci_dev(sock->dev.parent), sg, nents, direction);
|
|
}
|
|
EXPORT_SYMBOL(tifm_map_sg);
|
|
|
|
void tifm_unmap_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,
|
|
int direction)
|
|
{
|
|
pci_unmap_sg(to_pci_dev(sock->dev.parent), sg, nents, direction);
|
|
}
|
|
EXPORT_SYMBOL(tifm_unmap_sg);
|
|
|
|
void tifm_queue_work(struct work_struct *work)
|
|
{
|
|
queue_work(workqueue, work);
|
|
}
|
|
EXPORT_SYMBOL(tifm_queue_work);
|
|
|
|
int tifm_register_driver(struct tifm_driver *drv)
|
|
{
|
|
drv->driver.bus = &tifm_bus_type;
|
|
|
|
return driver_register(&drv->driver);
|
|
}
|
|
EXPORT_SYMBOL(tifm_register_driver);
|
|
|
|
void tifm_unregister_driver(struct tifm_driver *drv)
|
|
{
|
|
driver_unregister(&drv->driver);
|
|
}
|
|
EXPORT_SYMBOL(tifm_unregister_driver);
|
|
|
|
static int __init tifm_init(void)
|
|
{
|
|
int rc;
|
|
|
|
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;
|
|
}
|
|
|
|
static void __exit tifm_exit(void)
|
|
{
|
|
class_unregister(&tifm_adapter_class);
|
|
bus_unregister(&tifm_bus_type);
|
|
destroy_workqueue(workqueue);
|
|
}
|
|
|
|
subsys_initcall(tifm_init);
|
|
module_exit(tifm_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Alex Dubov");
|
|
MODULE_DESCRIPTION("TI FlashMedia core driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_VERSION(DRIVER_VERSION);
|