tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Lee Jones db783e76 ab099cc6

+33 -33
+21 -21
drivers/mfd/ab8500-core.c
··· 610 610 } 611 611 612 612 static const struct mfd_cell ab8500_bm_devs[] = { 613 - OF_MFD_CELL("ab8500-charger", NULL, &ab8500_bm_data, 613 + MFD_CELL_OF("ab8500-charger", NULL, &ab8500_bm_data, 614 614 sizeof(ab8500_bm_data), 0, "stericsson,ab8500-charger"), 615 - OF_MFD_CELL("ab8500-btemp", NULL, &ab8500_bm_data, 615 + MFD_CELL_OF("ab8500-btemp", NULL, &ab8500_bm_data, 616 616 sizeof(ab8500_bm_data), 0, "stericsson,ab8500-btemp"), 617 - OF_MFD_CELL("ab8500-fg", NULL, &ab8500_bm_data, 617 + MFD_CELL_OF("ab8500-fg", NULL, &ab8500_bm_data, 618 618 sizeof(ab8500_bm_data), 0, "stericsson,ab8500-fg"), 619 - OF_MFD_CELL("ab8500-chargalg", NULL, &ab8500_bm_data, 619 + MFD_CELL_OF("ab8500-chargalg", NULL, &ab8500_bm_data, 620 620 sizeof(ab8500_bm_data), 0, "stericsson,ab8500-chargalg"), 621 621 }; 622 622 623 623 static const struct mfd_cell ab8500_devs[] = { 624 624 #ifdef CONFIG_DEBUG_FS 625 - OF_MFD_CELL("ab8500-debug", 625 + MFD_CELL_OF("ab8500-debug", 626 626 NULL, NULL, 0, 0, "stericsson,ab8500-debug"), 627 627 #endif 628 - OF_MFD_CELL("ab8500-sysctrl", 628 + MFD_CELL_OF("ab8500-sysctrl", 629 629 NULL, NULL, 0, 0, "stericsson,ab8500-sysctrl"), 630 - OF_MFD_CELL("ab8500-ext-regulator", 630 + MFD_CELL_OF("ab8500-ext-regulator", 631 631 NULL, NULL, 0, 0, "stericsson,ab8500-ext-regulator"), 632 - OF_MFD_CELL("ab8500-regulator", 632 + MFD_CELL_OF("ab8500-regulator", 633 633 NULL, NULL, 0, 0, "stericsson,ab8500-regulator"), 634 - OF_MFD_CELL("ab8500-clk", 634 + MFD_CELL_OF("ab8500-clk", 635 635 NULL, NULL, 0, 0, "stericsson,ab8500-clk"), 636 - OF_MFD_CELL("ab8500-gpadc", 636 + MFD_CELL_OF("ab8500-gpadc", 637 637 NULL, NULL, 0, 0, "stericsson,ab8500-gpadc"), 638 - OF_MFD_CELL("ab8500-rtc", 638 + MFD_CELL_OF("ab8500-rtc", 639 639 NULL, NULL, 0, 0, "stericsson,ab8500-rtc"), 640 - OF_MFD_CELL("ab8500-acc-det", 640 + MFD_CELL_OF("ab8500-acc-det", 641 641 NULL, NULL, 0, 0, "stericsson,ab8500-acc-det"), 642 - OF_MFD_CELL("ab8500-poweron-key", 642 + MFD_CELL_OF("ab8500-poweron-key", 643 643 NULL, NULL, 0, 0, "stericsson,ab8500-poweron-key"), 644 - OF_MFD_CELL("ab8500-pwm", 644 + MFD_CELL_OF("ab8500-pwm", 645 645 NULL, NULL, 0, 1, "stericsson,ab8500-pwm"), 646 - OF_MFD_CELL("ab8500-pwm", 646 + MFD_CELL_OF("ab8500-pwm", 647 647 NULL, NULL, 0, 2, "stericsson,ab8500-pwm"), 648 - OF_MFD_CELL("ab8500-pwm", 648 + MFD_CELL_OF("ab8500-pwm", 649 649 NULL, NULL, 0, 3, "stericsson,ab8500-pwm"), 650 - OF_MFD_CELL("ab8500-denc", 650 + MFD_CELL_OF("ab8500-denc", 651 651 NULL, NULL, 0, 0, "stericsson,ab8500-denc"), 652 - OF_MFD_CELL("pinctrl-ab8500", 652 + MFD_CELL_OF("pinctrl-ab8500", 653 653 NULL, NULL, 0, 0, "stericsson,ab8500-gpio"), 654 - OF_MFD_CELL("abx500-temp", 654 + MFD_CELL_OF("abx500-temp", 655 655 NULL, NULL, 0, 0, "stericsson,abx500-temp"), 656 - OF_MFD_CELL("ab8500-usb", 656 + MFD_CELL_OF("ab8500-usb", 657 657 NULL, NULL, 0, 0, "stericsson,ab8500-usb"), 658 - OF_MFD_CELL("ab8500-codec", 658 + MFD_CELL_OF("ab8500-codec", 659 659 NULL, NULL, 0, 0, "stericsson,ab8500-codec"), 660 660 }; 661 661
+3 -3
drivers/mfd/db8500-prcmu.c
··· 2954 2954 }; 2955 2955 2956 2956 static const struct mfd_cell db8500_prcmu_devs[] = { 2957 - OF_MFD_CELL("db8500-prcmu-regulators", NULL, 2957 + MFD_CELL_OF("db8500-prcmu-regulators", NULL, 2958 2958 &db8500_regulators, sizeof(db8500_regulators), 0, 2959 2959 "stericsson,db8500-prcmu-regulator"), 2960 - OF_MFD_CELL("cpuidle-dbx500", 2960 + MFD_CELL_OF("cpuidle-dbx500", 2961 2961 NULL, NULL, 0, 0, "stericsson,cpuidle-dbx500"), 2962 - OF_MFD_CELL("db8500-thermal", 2962 + MFD_CELL_OF("db8500-thermal", 2963 2963 NULL, NULL, 0, 0, "stericsson,db8500-thermal"), 2964 2964 }; 2965 2965
+6 -6
drivers/mfd/mt6360-core.c
··· 292 292 }; 293 293 294 294 static const struct mfd_cell mt6360_devs[] = { 295 - OF_MFD_CELL("mt6360_adc", mt6360_adc_resources, 295 + MFD_CELL_OF("mt6360_adc", mt6360_adc_resources, 296 296 NULL, 0, 0, "mediatek,mt6360_adc"), 297 - OF_MFD_CELL("mt6360_chg", mt6360_chg_resources, 297 + MFD_CELL_OF("mt6360_chg", mt6360_chg_resources, 298 298 NULL, 0, 0, "mediatek,mt6360_chg"), 299 - OF_MFD_CELL("mt6360_led", mt6360_led_resources, 299 + MFD_CELL_OF("mt6360_led", mt6360_led_resources, 300 300 NULL, 0, 0, "mediatek,mt6360_led"), 301 - OF_MFD_CELL("mt6360_pmic", mt6360_pmic_resources, 301 + MFD_CELL_OF("mt6360_pmic", mt6360_pmic_resources, 302 302 NULL, 0, 0, "mediatek,mt6360_pmic"), 303 - OF_MFD_CELL("mt6360_ldo", mt6360_ldo_resources, 303 + MFD_CELL_OF("mt6360_ldo", mt6360_ldo_resources, 304 304 NULL, 0, 0, "mediatek,mt6360_ldo"), 305 - OF_MFD_CELL("mt6360_tcpc", NULL, 305 + MFD_CELL_OF("mt6360_tcpc", NULL, 306 306 NULL, 0, 0, "mediatek,mt6360_tcpc"), 307 307 }; 308 308
+3 -3
include/linux/mfd/core.h
··· 28 28 .id = (_id), \ 29 29 } 30 30 31 - #define OF_MFD_CELL_REG(_name, _res, _pdata, _pdsize, _id, _compat, _of_reg) \ 31 + #define MFD_CELL_OF_REG(_name, _res, _pdata, _pdsize, _id, _compat, _of_reg) \ 32 32 MFD_CELL_ALL(_name, _res, _pdata, _pdsize, _id, _compat, _of_reg, true, NULL) 33 33 34 - #define OF_MFD_CELL(_name, _res, _pdata, _pdsize, _id, _compat) \ 34 + #define MFD_CELL_OF(_name, _res, _pdata, _pdsize, _id, _compat) \ 35 35 MFD_CELL_ALL(_name, _res, _pdata, _pdsize, _id, _compat, 0, false, NULL) 36 36 37 - #define ACPI_MFD_CELL(_name, _res, _pdata, _pdsize, _id, _match) \ 37 + #define MFD_CELL_ACPI(_name, _res, _pdata, _pdsize, _id, _match) \ 38 38 MFD_CELL_ALL(_name, _res, _pdata, _pdsize, _id, NULL, 0, false, _match) 39 39 40 40 #define MFD_CELL_BASIC(_name, _res, _pdata, _pdsize, _id) \