| Message ID | 87a64i87zp.fsf@pond.sub.org |
|---|---|
| State | New |
| Headers | show |
| Series | cleanup: Tweak and re-run return_directly.cocci | expand |
On Wed, 23 Nov 2022, Markus Armbruster wrote: > Suggested-by: BALATON Zoltan <balaton@eik.bme.hu> > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> I thought you could include the hunk modifying sdram_ddr2_size in this patch too and make it a separate clean up to reduce the size of the Coccinelle patch making that easier to review but it's OK either way. Thanks for doing this clean up. Regards, BALATON Zoltan > --- > hw/ppc/ppc4xx_sdram.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c > index 54bf9a2b44..a24c80b1d2 100644 > --- a/hw/ppc/ppc4xx_sdram.c > +++ b/hw/ppc/ppc4xx_sdram.c > @@ -192,17 +192,13 @@ static inline hwaddr sdram_ddr_base(uint32_t bcr) > > static hwaddr sdram_ddr_size(uint32_t bcr) > { > - hwaddr size; > - int sh; > + int sh = (bcr >> 17) & 0x7; > > - sh = (bcr >> 17) & 0x7; > if (sh == 7) { > - size = -1; > - } else { > - size = (4 * MiB) << sh; > + return -1; > } > > - return size; > + return (4 * MiB) << sh; > } > > static uint32_t sdram_ddr_dcr_read(void *opaque, int dcrn) >
BALATON Zoltan <balaton@eik.bme.hu> writes: > On Wed, 23 Nov 2022, Markus Armbruster wrote: >> Suggested-by: BALATON Zoltan <balaton@eik.bme.hu> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> > > Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> > > I thought you could include the hunk modifying sdram_ddr2_size in this patch too and make it a separate clean up to reduce the size of the > Coccinelle patch making that easier to review but it's OK either way. Thanks for doing this clean up. Yes, I could do that, but since I got R-bys already, I opted for minimizing change. Thanks!
On 23/11/22 08:06, Markus Armbruster wrote: > Suggested-by: BALATON Zoltan <balaton@eik.bme.hu> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > hw/ppc/ppc4xx_sdram.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c index 54bf9a2b44..a24c80b1d2 100644 --- a/hw/ppc/ppc4xx_sdram.c +++ b/hw/ppc/ppc4xx_sdram.c @@ -192,17 +192,13 @@ static inline hwaddr sdram_ddr_base(uint32_t bcr) static hwaddr sdram_ddr_size(uint32_t bcr) { - hwaddr size; - int sh; + int sh = (bcr >> 17) & 0x7; - sh = (bcr >> 17) & 0x7; if (sh == 7) { - size = -1; - } else { - size = (4 * MiB) << sh; + return -1; } - return size; + return (4 * MiB) << sh; } static uint32_t sdram_ddr_dcr_read(void *opaque, int dcrn)
Suggested-by: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/ppc/ppc4xx_sdram.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)