2007-05-26 11:48:18 +00:00
|
|
|
/*
|
|
|
|
* linux/drivers/mmc/core/sdio_bus.c
|
|
|
|
*
|
|
|
|
* Copyright 2007 Pierre Ossman
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*
|
|
|
|
* SDIO function driver model
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/err.h>
|
2011-07-10 16:42:00 +00:00
|
|
|
#include <linux/export.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
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>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2010-10-02 11:54:09 +00:00
|
|
|
#include <linux/pm_runtime.h>
|
2007-05-26 11:48:18 +00:00
|
|
|
|
|
|
|
#include <linux/mmc/card.h>
|
2010-11-19 07:29:09 +00:00
|
|
|
#include <linux/mmc/host.h>
|
2007-05-26 11:48:18 +00:00
|
|
|
#include <linux/mmc/sdio_func.h>
|
|
|
|
|
2007-06-16 06:06:47 +00:00
|
|
|
#include "sdio_cis.h"
|
2007-05-26 11:48:18 +00:00
|
|
|
#include "sdio_bus.h"
|
|
|
|
|
2007-06-17 09:42:21 +00:00
|
|
|
/* show configuration fields */
|
|
|
|
#define sdio_config_attr(field, format_string) \
|
|
|
|
static ssize_t \
|
|
|
|
field##_show(struct device *dev, struct device_attribute *attr, char *buf) \
|
|
|
|
{ \
|
|
|
|
struct sdio_func *func; \
|
|
|
|
\
|
|
|
|
func = dev_to_sdio_func (dev); \
|
|
|
|
return sprintf (buf, format_string, func->field); \
|
|
|
|
}
|
|
|
|
|
|
|
|
sdio_config_attr(class, "0x%02x\n");
|
|
|
|
sdio_config_attr(vendor, "0x%04x\n");
|
|
|
|
sdio_config_attr(device, "0x%04x\n");
|
|
|
|
|
|
|
|
static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
|
{
|
|
|
|
struct sdio_func *func = dev_to_sdio_func (dev);
|
|
|
|
|
|
|
|
return sprintf(buf, "sdio:c%02Xv%04Xd%04X\n",
|
|
|
|
func->class, func->vendor, func->device);
|
|
|
|
}
|
|
|
|
|
2007-07-29 14:58:09 +00:00
|
|
|
static struct device_attribute sdio_dev_attrs[] = {
|
2007-06-17 09:42:21 +00:00
|
|
|
__ATTR_RO(class),
|
|
|
|
__ATTR_RO(vendor),
|
|
|
|
__ATTR_RO(device),
|
|
|
|
__ATTR_RO(modalias),
|
|
|
|
__ATTR_NULL,
|
|
|
|
};
|
|
|
|
|
2007-06-16 13:54:55 +00:00
|
|
|
static const struct sdio_device_id *sdio_match_one(struct sdio_func *func,
|
|
|
|
const struct sdio_device_id *id)
|
|
|
|
{
|
|
|
|
if (id->class != (__u8)SDIO_ANY_ID && id->class != func->class)
|
|
|
|
return NULL;
|
|
|
|
if (id->vendor != (__u16)SDIO_ANY_ID && id->vendor != func->vendor)
|
|
|
|
return NULL;
|
|
|
|
if (id->device != (__u16)SDIO_ANY_ID && id->device != func->device)
|
|
|
|
return NULL;
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct sdio_device_id *sdio_match_device(struct sdio_func *func,
|
|
|
|
struct sdio_driver *sdrv)
|
|
|
|
{
|
|
|
|
const struct sdio_device_id *ids;
|
|
|
|
|
|
|
|
ids = sdrv->id_table;
|
|
|
|
|
|
|
|
if (ids) {
|
|
|
|
while (ids->class || ids->vendor || ids->device) {
|
|
|
|
if (sdio_match_one(func, ids))
|
|
|
|
return ids;
|
|
|
|
ids++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-05-26 11:48:18 +00:00
|
|
|
|
|
|
|
static int sdio_bus_match(struct device *dev, struct device_driver *drv)
|
|
|
|
{
|
2007-06-16 13:54:55 +00:00
|
|
|
struct sdio_func *func = dev_to_sdio_func(dev);
|
|
|
|
struct sdio_driver *sdrv = to_sdio_driver(drv);
|
|
|
|
|
|
|
|
if (sdio_match_device(func, sdrv))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
2007-05-26 11:48:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2007-10-14 04:46:09 +00:00
|
|
|
sdio_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
|
2007-05-26 11:48:18 +00:00
|
|
|
{
|
2007-06-17 09:34:23 +00:00
|
|
|
struct sdio_func *func = dev_to_sdio_func(dev);
|
|
|
|
|
2007-10-14 04:46:09 +00:00
|
|
|
if (add_uevent_var(env,
|
2007-06-17 09:34:23 +00:00
|
|
|
"SDIO_CLASS=%02X", func->class))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2007-10-14 04:46:09 +00:00
|
|
|
if (add_uevent_var(env,
|
2007-06-17 09:34:23 +00:00
|
|
|
"SDIO_ID=%04X:%04X", func->vendor, func->device))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2007-10-14 04:46:09 +00:00
|
|
|
if (add_uevent_var(env,
|
2007-06-17 09:34:23 +00:00
|
|
|
"MODALIAS=sdio:c%02Xv%04Xd%04X",
|
|
|
|
func->class, func->vendor, func->device))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2007-05-26 11:48:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sdio_bus_probe(struct device *dev)
|
|
|
|
{
|
2007-06-16 13:54:55 +00:00
|
|
|
struct sdio_driver *drv = to_sdio_driver(dev->driver);
|
|
|
|
struct sdio_func *func = dev_to_sdio_func(dev);
|
|
|
|
const struct sdio_device_id *id;
|
2007-08-08 13:23:48 +00:00
|
|
|
int ret;
|
2007-06-16 13:54:55 +00:00
|
|
|
|
|
|
|
id = sdio_match_device(func, drv);
|
|
|
|
if (!id)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2010-10-02 11:54:11 +00:00
|
|
|
/* Unbound SDIO functions are always suspended.
|
|
|
|
* During probe, the function is set active and the usage count
|
|
|
|
* is incremented. If the driver supports runtime PM,
|
|
|
|
* it should call pm_runtime_put_noidle() in its probe routine and
|
|
|
|
* pm_runtime_get_noresume() in its remove routine.
|
|
|
|
*/
|
2010-11-19 07:29:09 +00:00
|
|
|
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD) {
|
|
|
|
ret = pm_runtime_get_sync(dev);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
2010-10-02 11:54:11 +00:00
|
|
|
|
2007-08-08 13:23:48 +00:00
|
|
|
/* Set the default block size so the driver is sure it's something
|
|
|
|
* sensible. */
|
|
|
|
sdio_claim_host(func);
|
|
|
|
ret = sdio_set_block_size(func, 0);
|
|
|
|
sdio_release_host(func);
|
|
|
|
if (ret)
|
2010-10-02 11:54:11 +00:00
|
|
|
goto disable_runtimepm;
|
|
|
|
|
|
|
|
ret = drv->probe(func, id);
|
|
|
|
if (ret)
|
|
|
|
goto disable_runtimepm;
|
|
|
|
|
|
|
|
return 0;
|
2007-08-08 13:23:48 +00:00
|
|
|
|
2010-10-02 11:54:11 +00:00
|
|
|
disable_runtimepm:
|
2010-11-19 07:29:09 +00:00
|
|
|
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
|
|
|
|
pm_runtime_put_noidle(dev);
|
2010-10-02 11:54:11 +00:00
|
|
|
out:
|
|
|
|
return ret;
|
2007-05-26 11:48:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int sdio_bus_remove(struct device *dev)
|
|
|
|
{
|
2007-06-16 13:54:55 +00:00
|
|
|
struct sdio_driver *drv = to_sdio_driver(dev->driver);
|
|
|
|
struct sdio_func *func = dev_to_sdio_func(dev);
|
2010-11-19 07:29:09 +00:00
|
|
|
int ret = 0;
|
2010-10-02 11:54:11 +00:00
|
|
|
|
|
|
|
/* Make sure card is powered before invoking ->remove() */
|
2011-07-17 15:38:21 +00:00
|
|
|
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
|
|
|
|
pm_runtime_get_sync(dev);
|
2007-06-16 13:54:55 +00:00
|
|
|
|
|
|
|
drv->remove(func);
|
|
|
|
|
2007-06-30 14:29:41 +00:00
|
|
|
if (func->irq_handler) {
|
2011-10-11 06:14:09 +00:00
|
|
|
pr_warning("WARNING: driver %s did not remove "
|
2007-06-30 14:29:41 +00:00
|
|
|
"its interrupt handler!\n", drv->name);
|
|
|
|
sdio_claim_host(func);
|
|
|
|
sdio_release_irq(func);
|
|
|
|
sdio_release_host(func);
|
|
|
|
}
|
|
|
|
|
2010-10-02 11:54:11 +00:00
|
|
|
/* First, undo the increment made directly above */
|
2010-11-19 07:29:09 +00:00
|
|
|
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
|
|
|
|
pm_runtime_put_noidle(dev);
|
2010-10-02 11:54:11 +00:00
|
|
|
|
|
|
|
/* Then undo the runtime PM settings in sdio_bus_probe() */
|
2010-11-19 07:29:09 +00:00
|
|
|
if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
|
2011-06-09 23:40:27 +00:00
|
|
|
pm_runtime_put_sync(dev);
|
2010-10-02 11:54:11 +00:00
|
|
|
|
|
|
|
return ret;
|
2007-05-26 11:48:18 +00:00
|
|
|
}
|
|
|
|
|
mmc: sdio: Use empty system suspend/resume callbacks at the bus level
Neil Brown reports that commit 35cd133c
PM: Run the driver callback directly if the subsystem one is not there
breaks suspend for his libertas wifi, because SDIO has a protocol
where the suspend method can return -ENOSYS and this means "There is
no point in suspending, just turn me off". Moreover, the suspend
methods provided by SDIO drivers are not supposed to be called by
the PM core or bus-level suspend routines (which aren't presend for
SDIO). Instead, when the SDIO core gets to suspend the device's
ancestor, it calls the device driver's suspend function, catches the
ENOSYS, and turns the device off.
The commit above breaks the SDIO core's assumption that the device
drivers' callbacks won't be executed if it doesn't provide any
bus-level callbacks. If fact, however, this assumption has never
been really satisfied, because device class or device type suspend
might very well use the driver's callback even without that commit.
The simplest way to address this problem is to make the SDIO core
tell the PM core to ignore driver callbacks, for example by providing
no-operation suspend/resume callbacks at the bus level for it,
which is implemented by this change.
Reported-and-tested-by: Neil Brown <neilb@suse.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
[stable: please apply to 3.3-stable only]
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2012-04-01 04:34:58 +00:00
|
|
|
#ifdef CONFIG_PM
|
2012-12-02 13:48:50 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
|
|
static int pm_no_operation(struct device *dev)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Prevent the PM core from calling SDIO device drivers' suspend
|
|
|
|
* callback routines, which it is not supposed to do, by using this
|
|
|
|
* empty function as the bus type suspend callaback for SDIO.
|
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-10-02 11:54:09 +00:00
|
|
|
static const struct dev_pm_ops sdio_bus_pm_ops = {
|
2012-12-02 13:48:50 +00:00
|
|
|
SET_SYSTEM_SLEEP_PM_OPS(pm_no_operation, pm_no_operation)
|
2010-10-02 11:54:09 +00:00
|
|
|
SET_RUNTIME_PM_OPS(
|
|
|
|
pm_generic_runtime_suspend,
|
|
|
|
pm_generic_runtime_resume,
|
|
|
|
pm_generic_runtime_idle
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
#define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops)
|
|
|
|
|
mmc: sdio: Use empty system suspend/resume callbacks at the bus level
Neil Brown reports that commit 35cd133c
PM: Run the driver callback directly if the subsystem one is not there
breaks suspend for his libertas wifi, because SDIO has a protocol
where the suspend method can return -ENOSYS and this means "There is
no point in suspending, just turn me off". Moreover, the suspend
methods provided by SDIO drivers are not supposed to be called by
the PM core or bus-level suspend routines (which aren't presend for
SDIO). Instead, when the SDIO core gets to suspend the device's
ancestor, it calls the device driver's suspend function, catches the
ENOSYS, and turns the device off.
The commit above breaks the SDIO core's assumption that the device
drivers' callbacks won't be executed if it doesn't provide any
bus-level callbacks. If fact, however, this assumption has never
been really satisfied, because device class or device type suspend
might very well use the driver's callback even without that commit.
The simplest way to address this problem is to make the SDIO core
tell the PM core to ignore driver callbacks, for example by providing
no-operation suspend/resume callbacks at the bus level for it,
which is implemented by this change.
Reported-and-tested-by: Neil Brown <neilb@suse.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
[stable: please apply to 3.3-stable only]
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2012-04-01 04:34:58 +00:00
|
|
|
#else /* !CONFIG_PM */
|
2010-10-02 11:54:09 +00:00
|
|
|
|
|
|
|
#define SDIO_PM_OPS_PTR NULL
|
|
|
|
|
mmc: sdio: Use empty system suspend/resume callbacks at the bus level
Neil Brown reports that commit 35cd133c
PM: Run the driver callback directly if the subsystem one is not there
breaks suspend for his libertas wifi, because SDIO has a protocol
where the suspend method can return -ENOSYS and this means "There is
no point in suspending, just turn me off". Moreover, the suspend
methods provided by SDIO drivers are not supposed to be called by
the PM core or bus-level suspend routines (which aren't presend for
SDIO). Instead, when the SDIO core gets to suspend the device's
ancestor, it calls the device driver's suspend function, catches the
ENOSYS, and turns the device off.
The commit above breaks the SDIO core's assumption that the device
drivers' callbacks won't be executed if it doesn't provide any
bus-level callbacks. If fact, however, this assumption has never
been really satisfied, because device class or device type suspend
might very well use the driver's callback even without that commit.
The simplest way to address this problem is to make the SDIO core
tell the PM core to ignore driver callbacks, for example by providing
no-operation suspend/resume callbacks at the bus level for it,
which is implemented by this change.
Reported-and-tested-by: Neil Brown <neilb@suse.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
[stable: please apply to 3.3-stable only]
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2012-04-01 04:34:58 +00:00
|
|
|
#endif /* !CONFIG_PM */
|
2010-10-02 11:54:09 +00:00
|
|
|
|
2007-05-26 11:48:18 +00:00
|
|
|
static struct bus_type sdio_bus_type = {
|
|
|
|
.name = "sdio",
|
2007-06-17 09:42:21 +00:00
|
|
|
.dev_attrs = sdio_dev_attrs,
|
2007-05-26 11:48:18 +00:00
|
|
|
.match = sdio_bus_match,
|
|
|
|
.uevent = sdio_bus_uevent,
|
|
|
|
.probe = sdio_bus_probe,
|
|
|
|
.remove = sdio_bus_remove,
|
2010-10-02 11:54:09 +00:00
|
|
|
.pm = SDIO_PM_OPS_PTR,
|
2007-05-26 11:48:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
int sdio_register_bus(void)
|
|
|
|
{
|
|
|
|
return bus_register(&sdio_bus_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
void sdio_unregister_bus(void)
|
|
|
|
{
|
|
|
|
bus_unregister(&sdio_bus_type);
|
|
|
|
}
|
|
|
|
|
2007-05-27 10:00:02 +00:00
|
|
|
/**
|
|
|
|
* sdio_register_driver - register a function driver
|
|
|
|
* @drv: SDIO function driver
|
|
|
|
*/
|
|
|
|
int sdio_register_driver(struct sdio_driver *drv)
|
|
|
|
{
|
|
|
|
drv->drv.name = drv->name;
|
|
|
|
drv->drv.bus = &sdio_bus_type;
|
|
|
|
return driver_register(&drv->drv);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(sdio_register_driver);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sdio_unregister_driver - unregister a function driver
|
|
|
|
* @drv: SDIO function driver
|
|
|
|
*/
|
|
|
|
void sdio_unregister_driver(struct sdio_driver *drv)
|
|
|
|
{
|
|
|
|
drv->drv.bus = &sdio_bus_type;
|
|
|
|
driver_unregister(&drv->drv);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(sdio_unregister_driver);
|
|
|
|
|
2007-05-26 11:48:18 +00:00
|
|
|
static void sdio_release_func(struct device *dev)
|
|
|
|
{
|
|
|
|
struct sdio_func *func = dev_to_sdio_func(dev);
|
2007-06-16 06:06:47 +00:00
|
|
|
|
2007-07-30 13:15:30 +00:00
|
|
|
sdio_free_func_cis(func);
|
2007-05-26 11:48:18 +00:00
|
|
|
|
2012-11-20 09:13:16 +00:00
|
|
|
kfree(func->info);
|
2007-09-19 16:42:16 +00:00
|
|
|
|
2007-05-26 11:48:18 +00:00
|
|
|
kfree(func);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate and initialise a new SDIO function structure.
|
|
|
|
*/
|
|
|
|
struct sdio_func *sdio_alloc_func(struct mmc_card *card)
|
|
|
|
{
|
|
|
|
struct sdio_func *func;
|
|
|
|
|
2007-07-31 22:05:24 +00:00
|
|
|
func = kzalloc(sizeof(struct sdio_func), GFP_KERNEL);
|
2007-05-26 11:48:18 +00:00
|
|
|
if (!func)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
|
|
func->card = card;
|
|
|
|
|
|
|
|
device_initialize(&func->dev);
|
|
|
|
|
|
|
|
func->dev.parent = &card->dev;
|
|
|
|
func->dev.bus = &sdio_bus_type;
|
|
|
|
func->dev.release = sdio_release_func;
|
|
|
|
|
|
|
|
return func;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Register a new SDIO function with the driver model.
|
|
|
|
*/
|
|
|
|
int sdio_add_func(struct sdio_func *func)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2008-11-08 20:37:46 +00:00
|
|
|
dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num);
|
2007-05-26 11:48:18 +00:00
|
|
|
|
|
|
|
ret = device_add(&func->dev);
|
|
|
|
if (ret == 0)
|
|
|
|
sdio_func_set_present(func);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unregister a SDIO function with the driver model, and
|
|
|
|
* (eventually) free it.
|
2009-12-17 23:27:17 +00:00
|
|
|
* This function can be called through error paths where sdio_add_func() was
|
|
|
|
* never executed (because a failure occurred at an earlier point).
|
2007-05-26 11:48:18 +00:00
|
|
|
*/
|
|
|
|
void sdio_remove_func(struct sdio_func *func)
|
|
|
|
{
|
2009-12-17 23:27:17 +00:00
|
|
|
if (!sdio_func_present(func))
|
|
|
|
return;
|
2007-05-26 11:48:18 +00:00
|
|
|
|
2009-12-17 23:27:17 +00:00
|
|
|
device_del(&func->dev);
|
2007-05-26 11:48:18 +00:00
|
|
|
put_device(&func->dev);
|
|
|
|
}
|
|
|
|
|