Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f77289ac authored by Andres Salomon's avatar Andres Salomon Committed by Samuel Ortiz
Browse files

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: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 7e5dc1f7

arch/x86/platform/olpc/olpc-xo1.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ static int __devinit olpc_xo1_probe(struct platform_device *pdev) 
	if (!machine_is_olpc())

	if (!machine_is_olpc())

		return -ENODEV;

		return -ENODEV;





	err = mfd_shared_cell_enable(pdev);

	err = mfd_cell_enable(pdev);

	if (err)

	if (err)

		return 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)

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)

	if (strcmp(pdev->name, "olpc-xo1-pms") == 0)

		pms_base = 0;

		pms_base = 0;

drivers/mfd/mfd-core.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/slab.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);

	const struct mfd_cell *cell = mfd_get_cell(pdev);

	int err = 0;

	int err = 0;
@@ -33,9 +33,9 @@ int mfd_shared_cell_enable(struct platform_device *pdev) 




	return err;

	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);

	const struct mfd_cell *cell = mfd_get_cell(pdev);

	int err = 0;

	int err = 0;
@@ -53,7 +53,7 @@ int mfd_shared_cell_disable(struct platform_device *pdev) 




	return err;

	return err;

}

}

EXPORT_SYMBOL(mfd_shared_cell_disable);

EXPORT_SYMBOL(mfd_cell_disable);





static int mfd_add_device(struct device *parent, int id,

static int mfd_add_device(struct device *parent, int id,

			  const struct mfd_cell *cell,

			  const struct mfd_cell *cell,

include/linux/mfd/core.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -59,8 +59,8 @@ struct mfd_cell { 
 * being called only when a device is first being enabled or no other

 * being called only when a device is first being enabled or no other

 * clients are making use of it.

 * clients are making use of it.

 */

 */

extern int mfd_shared_cell_enable(struct platform_device *pdev);

extern int mfd_cell_enable(struct platform_device *pdev);

extern int mfd_shared_cell_disable(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

 * Given a platform device that's been created by mfd_add_devices(), fetch