[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <9F4C7D19E8361D4C94921B95BE08B81BA08D59@zin33exm22.fsl.freescale.net>
Date: Wed, 16 Dec 2009 10:32:46 +0530
From: "Kumar Gopalpet-B05799" <B05799@...escale.com>
To: "Roel Kluin" <roel.kluin@...il.com>, <netdev@...r.kernel.org>,
"David Miller" <davem@...emloft.net>,
"Andrew Morton" <akpm@...ux-foundation.org>,
"LKML" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] gianfar: Fix tests of unsigneds in gfar_parse_group()
>interruptTransmit, -Receive and -Error are unsigned so the
>tests did not work.
>
>This also changes that if irq_of_parse_and_map(np, 0) returns
>NO_IRQ, that
>gfar_parse_group() returns an -EINVAL.
>
>Signed-off-by: Roel Kluin <roel.kluin@...il.com>
>---
>Found using coccinelle: http://coccinelle.lip6.fr/
>
>diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
>index 6850dc0..c411682 100644
>--- a/drivers/net/gianfar.c
>+++ b/drivers/net/gianfar.c
>@@ -522,6 +522,7 @@ static int gfar_parse_group(struct
>device_node *np, {
> u32 *queue_mask;
> u64 addr, size;
>+ int irq;
>
> addr = of_translate_address(np,
> of_get_address(np, 0, &size, NULL)); @@
>-530,20 +531,22 @@ static int gfar_parse_group(struct device_node *np,
> if (!priv->gfargrp[priv->num_grps].regs)
> return -ENOMEM;
>
>- priv->gfargrp[priv->num_grps].interruptTransmit =
>- irq_of_parse_and_map(np, 0);
>+ irq = irq_of_parse_and_map(np, 0);
>+ if (irq < 0)
>+ return -EINVAL;
>+ priv->gfargrp[priv->num_grps].interruptTransmit = irq;
>
> /* If we aren't the FEC we have multiple interrupts */
> if (model && strcasecmp(model, "FEC")) {
>- priv->gfargrp[priv->num_grps].interruptReceive =
>- irq_of_parse_and_map(np, 1);
>- priv->gfargrp[priv->num_grps].interruptError =
>- irq_of_parse_and_map(np,2);
>- if
>(priv->gfargrp[priv->num_grps].interruptTransmit < 0 ||
>-
>priv->gfargrp[priv->num_grps].interruptReceive < 0 ||
>-
>priv->gfargrp[priv->num_grps].interruptError < 0) {
>+ irq = irq_of_parse_and_map(np, 1);
>+ if (irq < 0)
> return -EINVAL;
>- }
>+ priv->gfargrp[priv->num_grps].interruptReceive = irq;
>+
>+ irq = irq_of_parse_and_map(np, 2);
>+ if (irq < 0)
>+ return -EINVAL;
>+ priv->gfargrp[priv->num_grps].interruptError = irq;
> }
>
> priv->gfargrp[priv->num_grps].grp_id = priv->num_grps;
Won't it be better to change types of interruptTransmit, -Receive and
-Error
in struct gfar_priv_grp itself. Something like this:
struct gfar_priv_grp {
....
- unsigned int interruptTransmit;
- unsigned int interruptReceive;
- unsigned int interruptError;
+ unsigned int interruptTransmit;
+ unsigned int interruptReceive;
+ unsigned int interruptError;
....
}
--
Thanks
Sandeep
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists