[PATCH 1/2] soc: mediatek: pwrap: fix compiler errors

[PATCH 1/2] soc: mediatek: pwrap: fix compiler errors

[Matthias Brugger]

When compiling using sparse, we got the following error:
drivers/soc/mediatek/mtk-pmic-wrap.c:686:25: error: dubious one-bit signed bitfield

Changing the data type to unsigned fixes this.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 5d61d127e1d7..912edf93c192 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -683,7 +683,7 @@ struct pmic_wrapper_type {
 	u32 int_en_all;
 	u32 spi_w;
 	u32 wdt_src;
-	int has_bridge:1;
+	unsigned int has_bridge:1;
 	int (*init_reg_clock)(struct pmic_wrapper *wrp);
 	int (*init_soc_specific)(struct pmic_wrapper *wrp);
 };
-- 
2.14.2

[PATCH 2/2] soc: mediatek: pwrap: fix fatal compiler error

[Matthias Brugger]

When adding the MT6380 compatible, the sentinel for of_device_id was
deleted, which leades to the following compiler error:
FATAL: drivers/soc/mediatek/mtk-pmic-wrap: struct of_device_id is not terminated with a NULL entry!

Fix this by adding the sentinel again.

Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 912edf93c192..e9e054a15b7d 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -1380,6 +1380,7 @@ static const struct of_device_id of_slave_match_tbl[] = {
 	}, {
 		.compatible = "mediatek,mt6397",
 		.data = &pmic_mt6397,
+	}, {
 		/* sentinel */
 	}
 };
-- 
2.14.2

[PATCH 2/2] soc: mediatek: pwrap: fix fatal compiler error

[Sean Wang]

On Sat, 2017-10-21 at 10:25 +0200, Matthias Brugger wrote:
> When adding the MT6380 compatible, the sentinel for of_device_id was
> deleted, which leades to the following compiler error:
> FATAL: drivers/soc/mediatek/mtk-pmic-wrap: struct of_device_id is not terminated with a NULL entry!
> 
> Fix this by adding the sentinel again.
> 
> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
>  drivers/soc/mediatek/mtk-pmic-wrap.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
> index 912edf93c192..e9e054a15b7d 100644
> --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
> +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
> @@ -1380,6 +1380,7 @@ static const struct of_device_id of_slave_match_tbl[] = {
>  	}, {
>  		.compatible = "mediatek,mt6397",
>  		.data = &pmic_mt6397,
> +	}, {
>  		/* sentinel */
>  	}
>  };

Thanks for patching the mistaken edit I made.

Acked-by: Sean Wang <sean.wang@mediatek.com>

[PATCH 2/2] soc: mediatek: pwrap: fix fatal compiler error

[Matthias Brugger]

On 10/22/2017 06:23 AM, Sean Wang wrote:
> On Sat, 2017-10-21 at 10:25 +0200, Matthias Brugger wrote:
>> When adding the MT6380 compatible, the sentinel for of_device_id was
>> deleted, which leades to the following compiler error:
>> FATAL: drivers/soc/mediatek/mtk-pmic-wrap: struct of_device_id is not terminated with a NULL entry!
>>
>> Fix this by adding the sentinel again.
>>
>> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
>> ---
>>   drivers/soc/mediatek/mtk-pmic-wrap.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
>> index 912edf93c192..e9e054a15b7d 100644
>> --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
>> +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
>> @@ -1380,6 +1380,7 @@ static const struct of_device_id of_slave_match_tbl[] = {
>>   	}, {
>>   		.compatible = "mediatek,mt6397",
>>   		.data = &pmic_mt6397,
>> +	}, {
>>   		/* sentinel */
>>   	}
>>   };
> 
> Thanks for patching the mistaken edit I made.
> 
> Acked-by: Sean Wang <sean.wang@mediatek.com>
> 
> 

Thanks, both patches pushed to v4.14-next/soc