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>

diff --git a/arch/x86/platform/olpc/olpc-xo1.c b/arch/x86/platform/olpc/olpc-xo1.c
index f4155354a7b0a3d2df3264ba5c9ad7126ac065a5..99513642a0e6b324bc7b148fd7160222d043c87e 100644 (file)
--- a/arch/x86/platform/olpc/olpc-xo1.c
+++ b/arch/x86/platform/olpc/olpc-xo1.c
@@ -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;

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index bb2264cc410bd7d4cbfa7f0ce6ba7d13b3ee8aee..79eda0264fb277176a2141338d9d4aa8682ea3b7 100644 (file)
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -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,

diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index ed9970412cc2a77f6436987a62ef7cd60bc35976..1408bf8eed5f2b811bd22aad529c951f1bcc5c1f 100644 (file)
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -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