OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: Rename mfd_shared_cell_{en,dis}able to drop the "shared" part 

As requested by Samuel, there's not really any reason to have "shared"
in the name.

This also modifies the only user of the function, as well.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Andres Salomon 2011-03-03 09:51:58 -08:00 committed by Samuel Ortiz
parent 7e5dc1f700
commit f77289ac25
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/platform/olpc/olpc-xo1.c
View File

@ -63,7 +63,7 @@ static int __devinit olpc_xo1_probe(struct platform_device *pdev)
if (!machine_is_olpc())
return -ENODEV;
err = mfd_shared_cell_enable(pdev);
err = mfd_cell_enable(pdev);
if (err)
return err;
@ -88,7 +88,7 @@ static int __devinit olpc_xo1_probe(struct platform_device *pdev)
static int __devexit olpc_xo1_remove(struct platform_device *pdev)
{
mfd_shared_cell_disable(pdev);
mfd_cell_disable(pdev);
if (strcmp(pdev->name, "olpc-xo1-pms") == 0)
pms_base = 0;

8
drivers/mfd/mfd-core.c
View File

@ -18,7 +18,7 @@
#include <linux/pm_runtime.h>
#include <linux/slab.h>
int mfd_shared_cell_enable(struct platform_device *pdev)
int mfd_cell_enable(struct platform_device *pdev)
{
const struct mfd_cell *cell = mfd_get_cell(pdev);
int err = 0;
@ -33,9 +33,9 @@ int mfd_shared_cell_enable(struct platform_device *pdev)
return err;
}
EXPORT_SYMBOL(mfd_shared_cell_enable);
EXPORT_SYMBOL(mfd_cell_enable);
int mfd_shared_cell_disable(struct platform_device *pdev)
int mfd_cell_disable(struct platform_device *pdev)
{
const struct mfd_cell *cell = mfd_get_cell(pdev);
int err = 0;
@ -53,7 +53,7 @@ int mfd_shared_cell_disable(struct platform_device *pdev)
return err;
}
EXPORT_SYMBOL(mfd_shared_cell_disable);
EXPORT_SYMBOL(mfd_cell_disable);
static int mfd_add_device(struct device *parent, int id,
const struct mfd_cell *cell,

4
include/linux/mfd/core.h
View File

@ -59,8 +59,8 @@ struct mfd_cell {
* being called only when a device is first being enabled or no other
* clients are making use of it.
*/
extern int mfd_shared_cell_enable(struct platform_device *pdev);
extern int mfd_shared_cell_disable(struct platform_device *pdev);
extern int mfd_cell_enable(struct platform_device *pdev);
extern int mfd_cell_disable(struct platform_device *pdev);
/*
* Given a platform device that's been created by mfd_add_devices(), fetch