linux-mips
[Top] [All Lists]

Re: [PATCH] MIPS: ath79: Avoid using unitialized 'reg' variable

To: Markos Chandras <markos.chandras@imgtec.com>
Subject: Re: [PATCH] MIPS: ath79: Avoid using unitialized 'reg' variable
From: Jonas Gorski <jogo@openwrt.org>
Date: Wed, 14 Aug 2013 13:12:56 +0200
Cc: linux-mips@linux-mips.org
In-reply-to: <1376384478-27424-1-git-send-email-markos.chandras@imgtec.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1376384478-27424-1-git-send-email-markos.chandras@imgtec.com>
Sender: linux-mips-bounce@linux-mips.org
Hi,

On Tue, Aug 13, 2013 at 11:01 AM, Markos Chandras
<markos.chandras@imgtec.com> wrote:
> Fixes the following build error:
> arch/mips/include/asm/mach-ath79/ath79.h:139:20: error: 'reg' may be used
> uninitialized in this function [-Werror=maybe-uninitialized]
> arch/mips/ath79/common.c:62:6: note: 'reg' was declared here
> In file included from arch/mips/ath79/common.c:20:0:
> arch/mips/ath79/common.c: In function 'ath79_device_reset_clear':
> arch/mips/include/asm/mach-ath79/ath79.h:139:20:
> error: 'reg' may be used uninitialized in this function
> [-Werror=maybe-uninitialized]
> arch/mips/ath79/common.c:90:6: note: 'reg' was declared here
>
> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
> ---
> This patch is for the upstream-sfr/mips-for-linux-next tree
> ---
>  arch/mips/ath79/common.c | 32 ++++++++++++++++++--------------
>  1 file changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c
> index eb3966c..6a8c00f 100644
> --- a/arch/mips/ath79/common.c
> +++ b/arch/mips/ath79/common.c
> @@ -62,20 +62,22 @@ void ath79_device_reset_set(u32 mask)
>         u32 reg;
>         u32 t;
>
> -       if (soc_is_ar71xx())
> +       if (soc_is_ar71xx()) {
>                 reg = AR71XX_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar724x())
> +       } else if (soc_is_ar724x()) {
>                 reg = AR724X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar913x())
> +       } else if (soc_is_ar913x()) {
>                 reg = AR913X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar933x())
> +       } else if (soc_is_ar933x()) {
>                 reg = AR933X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar934x())
> +       } else if (soc_is_ar934x()) {
>                 reg = AR934X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_qca955x())
> +       } else if (soc_is_qca955x()) {
>                 reg = QCA955X_RESET_REG_RESET_MODULE;
> -       else
> +       } else {
>                 BUG();
> +               panic("Unknown SOC!");

Both BUG() and panic() seems to be a bit overkill, especially since
the panic won't be reached unless BUG is disabled - just the panic()
should be enough.

Also the panic message isn't very helpful, maybe print the raw id of
the SoC here?

> +       }
>
>         spin_lock_irqsave(&ath79_device_reset_lock, flags);
>         t = ath79_reset_rr(reg);
> @@ -90,20 +92,22 @@ void ath79_device_reset_clear(u32 mask)
>         u32 reg;
>         u32 t;
>
> -       if (soc_is_ar71xx())
> +       if (soc_is_ar71xx()) {
>                 reg = AR71XX_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar724x())
> +       } else if (soc_is_ar724x()) {
>                 reg = AR724X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar913x())
> +       } else if (soc_is_ar913x()) {
>                 reg = AR913X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar933x())
> +       } else if (soc_is_ar933x()) {
>                 reg = AR933X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_ar934x())
> +       } else if (soc_is_ar934x()) {
>                 reg = AR934X_RESET_REG_RESET_MODULE;
> -       else if (soc_is_qca955x())
> +       } else if (soc_is_qca955x()) {
>                 reg = QCA955X_RESET_REG_RESET_MODULE;
> -       else
> +       } else {
>                 BUG();
> +               panic("Unknown SOC!");

Same comment here.

> +       }
>
>         spin_lock_irqsave(&ath79_device_reset_lock, flags);
>         t = ath79_reset_rr(reg);
> --
> 1.8.3.2


Regards
Jonas

<Prev in Thread] Current Thread [Next in Thread>