Use the correct macro when adding the MFD devices instead of using
directly '-1' value.
Signed-off-by: Fabien Parent <[email protected]>
---
drivers/mfd/mt6397-core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 337bcccdb914..190ed86ad93e 100644
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -299,9 +299,9 @@ static int mt6397_probe(struct platform_device *pdev)
if (ret)
return ret;
- ret = devm_mfd_add_devices(&pdev->dev, -1, mt6323_devs,
- ARRAY_SIZE(mt6323_devs), NULL,
- 0, pmic->irq_domain);
+ ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
+ mt6323_devs, ARRAY_SIZE(mt6323_devs),
+ NULL, 0, pmic->irq_domain);
break;
case MT6397_CID_CODE:
@@ -314,9 +314,9 @@ static int mt6397_probe(struct platform_device *pdev)
if (ret)
return ret;
- ret = devm_mfd_add_devices(&pdev->dev, -1, mt6397_devs,
- ARRAY_SIZE(mt6397_devs), NULL,
- 0, pmic->irq_domain);
+ ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
+ mt6397_devs, ARRAY_SIZE(mt6397_devs),
+ NULL, 0, pmic->irq_domain);
break;
default:
--
2.20.1
Use the DEFINE_RES_{MEM,IRQ} to define the RTC reosurce for the MT6397
PMIC.
Signed-off-by: Fabien Parent <[email protected]>
---
drivers/mfd/mt6397-core.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 190ed86ad93e..1e315712870b 100644
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -23,16 +23,8 @@
#define MT6397_CID_CODE 0x97
static const struct resource mt6397_rtc_resources[] = {
- {
- .start = MT6397_RTC_BASE,
- .end = MT6397_RTC_BASE + MT6397_RTC_SIZE,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = MT6397_IRQ_RTC,
- .end = MT6397_IRQ_RTC,
- .flags = IORESOURCE_IRQ,
- },
+ DEFINE_RES_MEM(MT6397_RTC_BASE, MT6397_RTC_SIZE),
+ DEFINE_RES_IRQ(MT6397_IRQ_RTC),
};
static const struct resource mt6323_keys_resources[] = {
--
2.20.1
On 18/06/2019 17:43, Fabien Parent wrote:
> Use the correct macro when adding the MFD devices instead of using
> directly '-1' value.
>
> Signed-off-by: Fabien Parent <[email protected]>
Reviewed-by: Matthias Brugger <[email protected]>
> ---
> drivers/mfd/mt6397-core.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
> index 337bcccdb914..190ed86ad93e 100644
> --- a/drivers/mfd/mt6397-core.c
> +++ b/drivers/mfd/mt6397-core.c
> @@ -299,9 +299,9 @@ static int mt6397_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> - ret = devm_mfd_add_devices(&pdev->dev, -1, mt6323_devs,
> - ARRAY_SIZE(mt6323_devs), NULL,
> - 0, pmic->irq_domain);
> + ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
> + mt6323_devs, ARRAY_SIZE(mt6323_devs),
> + NULL, 0, pmic->irq_domain);
> break;
>
> case MT6397_CID_CODE:
> @@ -314,9 +314,9 @@ static int mt6397_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> - ret = devm_mfd_add_devices(&pdev->dev, -1, mt6397_devs,
> - ARRAY_SIZE(mt6397_devs), NULL,
> - 0, pmic->irq_domain);
> + ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
> + mt6397_devs, ARRAY_SIZE(mt6397_devs),
> + NULL, 0, pmic->irq_domain);
> break;
>
> default:
>
On 18/06/2019 17:43, Fabien Parent wrote:
> Use the DEFINE_RES_{MEM,IRQ} to define the RTC reosurce for the MT6397
> PMIC.
>
> Signed-off-by: Fabien Parent <[email protected]>
Reviewed-by: Matthias Brugger <[email protected]>
> ---
> drivers/mfd/mt6397-core.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
> index 190ed86ad93e..1e315712870b 100644
> --- a/drivers/mfd/mt6397-core.c
> +++ b/drivers/mfd/mt6397-core.c
> @@ -23,16 +23,8 @@
> #define MT6397_CID_CODE 0x97
>
> static const struct resource mt6397_rtc_resources[] = {
> - {
> - .start = MT6397_RTC_BASE,
> - .end = MT6397_RTC_BASE + MT6397_RTC_SIZE,
> - .flags = IORESOURCE_MEM,
> - },
> - {
> - .start = MT6397_IRQ_RTC,
> - .end = MT6397_IRQ_RTC,
> - .flags = IORESOURCE_IRQ,
> - },
> + DEFINE_RES_MEM(MT6397_RTC_BASE, MT6397_RTC_SIZE),
> + DEFINE_RES_IRQ(MT6397_IRQ_RTC),
> };
>
> static const struct resource mt6323_keys_resources[] = {
>