mfd: Standardise MFD_CELL_* helper names

Start all helpers with "MFD_CELL_".

Cc: Gene Chen <gene_chen@richtek.com>
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index a3bac9d..ba8da06 100644 (file)
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -610,52 +610,52 @@ int ab8500_suspend(struct ab8500 *ab8500)
 }
 
 static const struct mfd_cell ab8500_bm_devs[] = {
-       OF_MFD_CELL("ab8500-charger", NULL, &ab8500_bm_data,
+       MFD_CELL_OF("ab8500-charger", NULL, &ab8500_bm_data,
                    sizeof(ab8500_bm_data), 0, "stericsson,ab8500-charger"),
-       OF_MFD_CELL("ab8500-btemp", NULL, &ab8500_bm_data,
+       MFD_CELL_OF("ab8500-btemp", NULL, &ab8500_bm_data,
                    sizeof(ab8500_bm_data), 0, "stericsson,ab8500-btemp"),
-       OF_MFD_CELL("ab8500-fg", NULL, &ab8500_bm_data,
+       MFD_CELL_OF("ab8500-fg", NULL, &ab8500_bm_data,
                    sizeof(ab8500_bm_data), 0, "stericsson,ab8500-fg"),
-       OF_MFD_CELL("ab8500-chargalg", NULL, &ab8500_bm_data,
+       MFD_CELL_OF("ab8500-chargalg", NULL, &ab8500_bm_data,
                    sizeof(ab8500_bm_data), 0, "stericsson,ab8500-chargalg"),
 };
 
 static const struct mfd_cell ab8500_devs[] = {
 #ifdef CONFIG_DEBUG_FS
-       OF_MFD_CELL("ab8500-debug",
+       MFD_CELL_OF("ab8500-debug",
                    NULL, NULL, 0, 0, "stericsson,ab8500-debug"),
 #endif
-       OF_MFD_CELL("ab8500-sysctrl",
+       MFD_CELL_OF("ab8500-sysctrl",
                    NULL, NULL, 0, 0, "stericsson,ab8500-sysctrl"),
-       OF_MFD_CELL("ab8500-ext-regulator",
+       MFD_CELL_OF("ab8500-ext-regulator",
                    NULL, NULL, 0, 0, "stericsson,ab8500-ext-regulator"),
-       OF_MFD_CELL("ab8500-regulator",
+       MFD_CELL_OF("ab8500-regulator",
                    NULL, NULL, 0, 0, "stericsson,ab8500-regulator"),
-       OF_MFD_CELL("ab8500-clk",
+       MFD_CELL_OF("ab8500-clk",
                    NULL, NULL, 0, 0, "stericsson,ab8500-clk"),
-       OF_MFD_CELL("ab8500-gpadc",
+       MFD_CELL_OF("ab8500-gpadc",
                    NULL, NULL, 0, 0, "stericsson,ab8500-gpadc"),
-       OF_MFD_CELL("ab8500-rtc",
+       MFD_CELL_OF("ab8500-rtc",
                    NULL, NULL, 0, 0, "stericsson,ab8500-rtc"),
-       OF_MFD_CELL("ab8500-acc-det",
+       MFD_CELL_OF("ab8500-acc-det",
                    NULL, NULL, 0, 0, "stericsson,ab8500-acc-det"),
-       OF_MFD_CELL("ab8500-poweron-key",
+       MFD_CELL_OF("ab8500-poweron-key",
                    NULL, NULL, 0, 0, "stericsson,ab8500-poweron-key"),
-       OF_MFD_CELL("ab8500-pwm",
+       MFD_CELL_OF("ab8500-pwm",
                    NULL, NULL, 0, 1, "stericsson,ab8500-pwm"),
-       OF_MFD_CELL("ab8500-pwm",
+       MFD_CELL_OF("ab8500-pwm",
                    NULL, NULL, 0, 2, "stericsson,ab8500-pwm"),
-       OF_MFD_CELL("ab8500-pwm",
+       MFD_CELL_OF("ab8500-pwm",
                    NULL, NULL, 0, 3, "stericsson,ab8500-pwm"),
-       OF_MFD_CELL("ab8500-denc",
+       MFD_CELL_OF("ab8500-denc",
                    NULL, NULL, 0, 0, "stericsson,ab8500-denc"),
-       OF_MFD_CELL("pinctrl-ab8500",
+       MFD_CELL_OF("pinctrl-ab8500",
                    NULL, NULL, 0, 0, "stericsson,ab8500-gpio"),
-       OF_MFD_CELL("abx500-temp",
+       MFD_CELL_OF("abx500-temp",
                    NULL, NULL, 0, 0, "stericsson,abx500-temp"),
-       OF_MFD_CELL("ab8500-usb",
+       MFD_CELL_OF("ab8500-usb",
                    NULL, NULL, 0, 0, "stericsson,ab8500-usb"),
-       OF_MFD_CELL("ab8500-codec",
+       MFD_CELL_OF("ab8500-codec",
                    NULL, NULL, 0, 0, "stericsson,ab8500-codec"),
 };
 

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index a5983d5..167faac 100644 (file)
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2954,12 +2954,12 @@ static const struct mfd_cell common_prcmu_devs[] = {
 };
 
 static const struct mfd_cell db8500_prcmu_devs[] = {
-       OF_MFD_CELL("db8500-prcmu-regulators", NULL,
+       MFD_CELL_OF("db8500-prcmu-regulators", NULL,
                    &db8500_regulators, sizeof(db8500_regulators), 0,
                    "stericsson,db8500-prcmu-regulator"),
-       OF_MFD_CELL("cpuidle-dbx500",
+       MFD_CELL_OF("cpuidle-dbx500",
                    NULL, NULL, 0, 0, "stericsson,cpuidle-dbx500"),
-       OF_MFD_CELL("db8500-thermal",
+       MFD_CELL_OF("db8500-thermal",
                    NULL, NULL, 0, 0, "stericsson,db8500-thermal"),
 };
 

diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index 4661c1b..480722a 100644 (file)
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -292,17 +292,17 @@ static const struct resource mt6360_ldo_resources[] = {
 };
 
 static const struct mfd_cell mt6360_devs[] = {
-       OF_MFD_CELL("mt6360_adc", mt6360_adc_resources,
+       MFD_CELL_OF("mt6360_adc", mt6360_adc_resources,
                    NULL, 0, 0, "mediatek,mt6360_adc"),
-       OF_MFD_CELL("mt6360_chg", mt6360_chg_resources,
+       MFD_CELL_OF("mt6360_chg", mt6360_chg_resources,
                    NULL, 0, 0, "mediatek,mt6360_chg"),
-       OF_MFD_CELL("mt6360_led", mt6360_led_resources,
+       MFD_CELL_OF("mt6360_led", mt6360_led_resources,
                    NULL, 0, 0, "mediatek,mt6360_led"),
-       OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources,
+       MFD_CELL_OF("mt6360_pmic", mt6360_pmic_resources,
                    NULL, 0, 0, "mediatek,mt6360_pmic"),
-       OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources,
+       MFD_CELL_OF("mt6360_ldo", mt6360_ldo_resources,
                    NULL, 0, 0, "mediatek,mt6360_ldo"),
-       OF_MFD_CELL("mt6360_tcpc", NULL,
+       MFD_CELL_OF("mt6360_tcpc", NULL,
                    NULL, 0, 0, "mediatek,mt6360_tcpc"),
 };
 

diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 4b35baa..2009c4b 100644 (file)
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -28,13 +28,13 @@
                .id = (_id),                                            \
        }
 
-#define OF_MFD_CELL_REG(_name, _res, _pdata, _pdsize, _id, _compat, _of_reg) \
+#define MFD_CELL_OF_REG(_name, _res, _pdata, _pdsize, _id, _compat, _of_reg) \
        MFD_CELL_ALL(_name, _res, _pdata, _pdsize, _id, _compat, _of_reg, true, NULL)
 
-#define OF_MFD_CELL(_name, _res, _pdata, _pdsize, _id, _compat) \
+#define MFD_CELL_OF(_name, _res, _pdata, _pdsize, _id, _compat) \
        MFD_CELL_ALL(_name, _res, _pdata, _pdsize, _id, _compat, 0, false, NULL)
 
-#define ACPI_MFD_CELL(_name, _res, _pdata, _pdsize, _id, _match) \
+#define MFD_CELL_ACPI(_name, _res, _pdata, _pdsize, _id, _match) \
        MFD_CELL_ALL(_name, _res, _pdata, _pdsize, _id, NULL, 0, false, _match)
 
 #define MFD_CELL_BASIC(_name, _res, _pdata, _pdsize, _id) \