* [PATCH] mfd: Fix checking return value of regmap_read()
@ 2012-07-11 1:27 Axel Lin
2012-07-11 1:50 ` Qiao Zhou
2012-07-16 13:28 ` Samuel Ortiz
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2012-07-11 1:27 UTC (permalink / raw)
To: SamuelOrtiz; +Cc: Qiao Zhou, Arnd Bergmann, linux-kernel
Check the return value of regmap_read() rather than the read value.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/88pm800.c | 16 +++++++++-------
drivers/mfd/88pm805.c | 5 +++--
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index ec7d9b8..b67a301 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -419,22 +419,24 @@ static int __devinit device_800_init(struct pm80x_chip *chip,
struct pm80x_platform_data *pdata)
{
int ret, pmic_id;
+ unsigned int val;
- regmap_read(chip->regmap, PM800_CHIP_ID, &ret);
+ ret = regmap_read(chip->regmap, PM800_CHIP_ID, &val);
if (ret < 0) {
dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
goto out;
}
- pmic_id = ret & PM80X_VERSION_MASK;
+ pmic_id = val & PM80X_VERSION_MASK;
if ((pmic_id >= PM800_CHIP_A0) && (pmic_id <= PM800_CHIP_END)) {
- chip->version = ret;
+ chip->version = val;
dev_info(chip->dev,
- "88PM80x:Marvell 88PM800 (ID:0x%x) detected\n", ret);
+ "88PM80x:Marvell 88PM800 (ID:0x%x) detected\n", val);
} else {
dev_err(chip->dev,
- "Failed to detect Marvell 88PM800:ChipID[0x%x]\n", ret);
+ "Failed to detect Marvell 88PM800:ChipID[0x%x]\n", val);
+ ret = -EINVAL;
goto out;
}
@@ -442,12 +444,12 @@ static int __devinit device_800_init(struct pm80x_chip *chip,
* alarm wake up bit will be clear in device_irq_init(),
* read before that
*/
- regmap_read(chip->regmap, PM800_RTC_CONTROL, &ret);
+ ret = regmap_read(chip->regmap, PM800_RTC_CONTROL, &val);
if (ret < 0) {
dev_err(chip->dev, "Failed to read RTC register: %d\n", ret);
goto out;
}
- if (ret & PM800_ALARM_WAKEUP) {
+ if (val & PM800_ALARM_WAKEUP) {
if (pdata && pdata->rtc)
pdata->rtc->rtc_wakeup = 1;
}
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index d59ca6b..6146583 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -192,6 +192,7 @@ static struct regmap_irq_chip pm805_irq_chip = {
static int __devinit device_805_init(struct pm80x_chip *chip)
{
int ret = 0;
+ unsigned int val;
struct regmap *map = chip->regmap;
if (!map) {
@@ -199,12 +200,12 @@ static int __devinit device_805_init(struct pm80x_chip *chip)
return -EINVAL;
}
- regmap_read(map, PM805_CHIP_ID, &ret);
+ ret = regmap_read(map, PM805_CHIP_ID, &val);
if (ret < 0) {
dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
goto out_irq_init;
}
- chip->version = ret;
+ chip->version = val;
chip->regmap_irq_chip = &pm805_irq_chip;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: Fix checking return value of regmap_read()
2012-07-11 1:27 [PATCH] mfd: Fix checking return value of regmap_read() Axel Lin
@ 2012-07-11 1:50 ` Qiao Zhou
2012-07-16 13:28 ` Samuel Ortiz
1 sibling, 0 replies; 3+ messages in thread
From: Qiao Zhou @ 2012-07-11 1:50 UTC (permalink / raw)
To: Axel Lin; +Cc: SamuelOrtiz, Arnd Bergmann, linux-kernel@vger.kernel.org
On 07/11/2012 09:27 AM, Axel Lin wrote:
> Check the return value of regmap_read() rather than the read value.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/mfd/88pm800.c | 16 +++++++++-------
> drivers/mfd/88pm805.c | 5 +++--
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
> index ec7d9b8..b67a301 100644
> --- a/drivers/mfd/88pm800.c
> +++ b/drivers/mfd/88pm800.c
> @@ -419,22 +419,24 @@ static int __devinit device_800_init(struct pm80x_chip *chip,
> struct pm80x_platform_data *pdata)
> {
> int ret, pmic_id;
> + unsigned int val;
>
> - regmap_read(chip->regmap, PM800_CHIP_ID, &ret);
> + ret = regmap_read(chip->regmap, PM800_CHIP_ID, &val);
> if (ret < 0) {
> dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
> goto out;
> }
>
> - pmic_id = ret & PM80X_VERSION_MASK;
> + pmic_id = val & PM80X_VERSION_MASK;
>
> if ((pmic_id >= PM800_CHIP_A0) && (pmic_id <= PM800_CHIP_END)) {
> - chip->version = ret;
> + chip->version = val;
> dev_info(chip->dev,
> - "88PM80x:Marvell 88PM800 (ID:0x%x) detected\n", ret);
> + "88PM80x:Marvell 88PM800 (ID:0x%x) detected\n", val);
> } else {
> dev_err(chip->dev,
> - "Failed to detect Marvell 88PM800:ChipID[0x%x]\n", ret);
> + "Failed to detect Marvell 88PM800:ChipID[0x%x]\n", val);
> + ret = -EINVAL;
> goto out;
> }
>
> @@ -442,12 +444,12 @@ static int __devinit device_800_init(struct pm80x_chip *chip,
> * alarm wake up bit will be clear in device_irq_init(),
> * read before that
> */
> - regmap_read(chip->regmap, PM800_RTC_CONTROL, &ret);
> + ret = regmap_read(chip->regmap, PM800_RTC_CONTROL, &val);
> if (ret < 0) {
> dev_err(chip->dev, "Failed to read RTC register: %d\n", ret);
> goto out;
> }
> - if (ret & PM800_ALARM_WAKEUP) {
> + if (val & PM800_ALARM_WAKEUP) {
> if (pdata && pdata->rtc)
> pdata->rtc->rtc_wakeup = 1;
> }
> diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
> index d59ca6b..6146583 100644
> --- a/drivers/mfd/88pm805.c
> +++ b/drivers/mfd/88pm805.c
> @@ -192,6 +192,7 @@ static struct regmap_irq_chip pm805_irq_chip = {
> static int __devinit device_805_init(struct pm80x_chip *chip)
> {
> int ret = 0;
> + unsigned int val;
> struct regmap *map = chip->regmap;
>
> if (!map) {
> @@ -199,12 +200,12 @@ static int __devinit device_805_init(struct pm80x_chip *chip)
> return -EINVAL;
> }
>
> - regmap_read(map, PM805_CHIP_ID, &ret);
> + ret = regmap_read(map, PM805_CHIP_ID, &val);
> if (ret < 0) {
> dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret);
> goto out_irq_init;
> }
> - chip->version = ret;
> + chip->version = val;
>
> chip->regmap_irq_chip = &pm805_irq_chip;
>
>
Axel,
thanks for the fixing.
--
Best Regards
Qiao
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: Fix checking return value of regmap_read()
2012-07-11 1:27 [PATCH] mfd: Fix checking return value of regmap_read() Axel Lin
2012-07-11 1:50 ` Qiao Zhou
@ 2012-07-16 13:28 ` Samuel Ortiz
1 sibling, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2012-07-16 13:28 UTC (permalink / raw)
To: Axel Lin; +Cc: Qiao Zhou, Arnd Bergmann, linux-kernel
Hi Axel,
On Wed, Jul 11, 2012 at 09:27:54AM +0800, Axel Lin wrote:
> Check the return value of regmap_read() rather than the read value.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/mfd/88pm800.c | 16 +++++++++-------
> drivers/mfd/88pm805.c | 5 +++--
> 2 files changed, 12 insertions(+), 9 deletions(-)
Applied, thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-16 13:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-11 1:27 [PATCH] mfd: Fix checking return value of regmap_read() Axel Lin
2012-07-11 1:50 ` Qiao Zhou
2012-07-16 13:28 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox