* Re: [patch -next] fb: fix recent breakage in correct_chipset()
2013-07-02 6:28 [patch -next] fb: fix recent breakage in correct_chipset() Dan Carpenter
@ 2013-07-02 15:50 ` Randy Dunlap
2013-07-12 20:11 ` Randy Dunlap
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2013-07-02 15:50 UTC (permalink / raw)
To: linux-fbdev
On 07/01/13 23:28, Dan Carpenter wrote:
> The 6e36308a6f "fb: fix atyfb build warning" isn't right. It makes all
> the indexes off by one. This patch reverts it and casts the
> ARRAY_SIZE() to int to silence the build warning.
Argh. Thanks.
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
> index a89c15d..9b0f12c 100644
> --- a/drivers/video/aty/atyfb_base.c
> +++ b/drivers/video/aty/atyfb_base.c
> @@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par)
> const char *name;
> int i;
>
> - for (i = ARRAY_SIZE(aty_chips); i > 0; i--)
> - if (par->pci_id = aty_chips[i - 1].pci_id)
> + for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
> + if (par->pci_id = aty_chips[i].pci_id)
> break;
>
> if (i < 0)
>
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch -next] fb: fix recent breakage in correct_chipset()
2013-07-02 6:28 [patch -next] fb: fix recent breakage in correct_chipset() Dan Carpenter
2013-07-02 15:50 ` Randy Dunlap
@ 2013-07-12 20:11 ` Randy Dunlap
2013-07-26 8:34 ` Tomi Valkeinen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2013-07-12 20:11 UTC (permalink / raw)
To: linux-fbdev
On 07/01/13 23:28, Dan Carpenter wrote:
> The 6e36308a6f "fb: fix atyfb build warning" isn't right. It makes all
> the indexes off by one. This patch reverts it and casts the
> ARRAY_SIZE() to int to silence the build warning.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Tomi,
My incorrect patch has been merged into mainline.
Please merge Dan's fix for it instead.
Thanks.
> diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
> index a89c15d..9b0f12c 100644
> --- a/drivers/video/aty/atyfb_base.c
> +++ b/drivers/video/aty/atyfb_base.c
> @@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par)
> const char *name;
> int i;
>
> - for (i = ARRAY_SIZE(aty_chips); i > 0; i--)
> - if (par->pci_id = aty_chips[i - 1].pci_id)
> + for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
> + if (par->pci_id = aty_chips[i].pci_id)
> break;
>
> if (i < 0)
>
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch -next] fb: fix recent breakage in correct_chipset()
2013-07-02 6:28 [patch -next] fb: fix recent breakage in correct_chipset() Dan Carpenter
2013-07-02 15:50 ` Randy Dunlap
2013-07-12 20:11 ` Randy Dunlap
@ 2013-07-26 8:34 ` Tomi Valkeinen
2013-08-01 9:31 ` Geert Uytterhoeven
2013-08-01 11:50 ` Dan Carpenter
4 siblings, 0 replies; 6+ messages in thread
From: Tomi Valkeinen @ 2013-07-26 8:34 UTC (permalink / raw)
To: linux-fbdev
[-- Attachment #1: Type: text/plain, Size: 924 bytes --]
On 02/07/13 09:28, Dan Carpenter wrote:
> The 6e36308a6f "fb: fix atyfb build warning" isn't right. It makes all
> the indexes off by one. This patch reverts it and casts the
> ARRAY_SIZE() to int to silence the build warning.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
> index a89c15d..9b0f12c 100644
> --- a/drivers/video/aty/atyfb_base.c
> +++ b/drivers/video/aty/atyfb_base.c
> @@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par)
> const char *name;
> int i;
>
> - for (i = ARRAY_SIZE(aty_chips); i > 0; i--)
> - if (par->pci_id == aty_chips[i - 1].pci_id)
> + for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
> + if (par->pci_id == aty_chips[i].pci_id)
> break;
>
> if (i < 0)
>
Thanks, I've applied this into my 3.11-fixes/fbdev branch.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch -next] fb: fix recent breakage in correct_chipset()
2013-07-02 6:28 [patch -next] fb: fix recent breakage in correct_chipset() Dan Carpenter
` (2 preceding siblings ...)
2013-07-26 8:34 ` Tomi Valkeinen
@ 2013-08-01 9:31 ` Geert Uytterhoeven
2013-08-01 11:50 ` Dan Carpenter
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2013-08-01 9:31 UTC (permalink / raw)
To: linux-fbdev
On Tue, Jul 2, 2013 at 8:28 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> The 6e36308a6f "fb: fix atyfb build warning" isn't right. It makes all
> the indexes off by one. This patch reverts it and casts the
> ARRAY_SIZE() to int to silence the build warning.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
> index a89c15d..9b0f12c 100644
> --- a/drivers/video/aty/atyfb_base.c
> +++ b/drivers/video/aty/atyfb_base.c
> @@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par)
> const char *name;
> int i;
>
> - for (i = ARRAY_SIZE(aty_chips); i > 0; i--)
> - if (par->pci_id = aty_chips[i - 1].pci_id)
> + for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
> + if (par->pci_id = aty_chips[i].pci_id)
> break;
>
> if (i < 0)
Sorry for chiming in late, but can't we just revert the order of the loop
iteration and change i from int to size_t instead of adding a cast?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch -next] fb: fix recent breakage in correct_chipset()
2013-07-02 6:28 [patch -next] fb: fix recent breakage in correct_chipset() Dan Carpenter
` (3 preceding siblings ...)
2013-08-01 9:31 ` Geert Uytterhoeven
@ 2013-08-01 11:50 ` Dan Carpenter
4 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2013-08-01 11:50 UTC (permalink / raw)
To: linux-fbdev
On Thu, Aug 01, 2013 at 11:31:07AM +0200, Geert Uytterhoeven wrote:
> On Tue, Jul 2, 2013 at 8:28 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > The 6e36308a6f "fb: fix atyfb build warning" isn't right. It makes all
> > the indexes off by one. This patch reverts it and casts the
> > ARRAY_SIZE() to int to silence the build warning.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
> > index a89c15d..9b0f12c 100644
> > --- a/drivers/video/aty/atyfb_base.c
> > +++ b/drivers/video/aty/atyfb_base.c
> > @@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par)
> > const char *name;
> > int i;
> >
> > - for (i = ARRAY_SIZE(aty_chips); i > 0; i--)
> > - if (par->pci_id = aty_chips[i - 1].pci_id)
> > + for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
> > + if (par->pci_id = aty_chips[i].pci_id)
> > break;
> >
> > if (i < 0)
>
> Sorry for chiming in late, but can't we just revert the order of the loop
> iteration and change i from int to size_t instead of adding a cast?
>
Nope. That would be a nearly-forever loop.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread