Message ID | 1412970269-21120-1-git-send-email-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show |
On Fri, 2014-10-10 at 20:44 +0100, Peter Maydell wrote: > Following cleanup of the vga device code in commit d2e043a8041, > the arrays dmask4 and dmask16 are now unused. gcc doesn't warn > about this, but clang does; remove them. Ah right, I missed those, thanks. > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/display/vga.c | 26 -------------------------- > 1 file changed, 26 deletions(-) > > diff --git a/hw/display/vga.c b/hw/display/vga.c > index 19e7f23..52eaf05 100644 > --- a/hw/display/vga.c > +++ b/hw/display/vga.c > @@ -136,32 +136,6 @@ static const uint32_t mask16[16] = { > #define PAT(x) cbswap_32(x) > #endif > > -static const uint32_t dmask16[16] = { > - PAT(0x00000000), > - PAT(0x000000ff), > - PAT(0x0000ff00), > - PAT(0x0000ffff), > - PAT(0x00ff0000), > - PAT(0x00ff00ff), > - PAT(0x00ffff00), > - PAT(0x00ffffff), > - PAT(0xff000000), > - PAT(0xff0000ff), > - PAT(0xff00ff00), > - PAT(0xff00ffff), > - PAT(0xffff0000), > - PAT(0xffff00ff), > - PAT(0xffffff00), > - PAT(0xffffffff), > -}; > - > -static const uint32_t dmask4[4] = { > - PAT(0x00000000), > - PAT(0x0000ffff), > - PAT(0xffff0000), > - PAT(0xffffffff), > -}; > - > static uint32_t expand4[256]; > static uint16_t expand2[256]; > static uint8_t expand4to8[16];
On Fri, Oct 10, 2014 at 08:44:29PM +0100, Peter Maydell wrote: > Following cleanup of the vga device code in commit d2e043a8041, > the arrays dmask4 and dmask16 are now unused. gcc doesn't warn > about this, but clang does; remove them. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
On Fr, 2014-10-10 at 20:44 +0100, Peter Maydell wrote: > Following cleanup of the vga device code in commit d2e043a8041, > the arrays dmask4 and dmask16 are now unused. gcc doesn't warn > about this, but clang does; remove them. Queued up. thanks, Gerd
diff --git a/hw/display/vga.c b/hw/display/vga.c index 19e7f23..52eaf05 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -136,32 +136,6 @@ static const uint32_t mask16[16] = { #define PAT(x) cbswap_32(x) #endif -static const uint32_t dmask16[16] = { - PAT(0x00000000), - PAT(0x000000ff), - PAT(0x0000ff00), - PAT(0x0000ffff), - PAT(0x00ff0000), - PAT(0x00ff00ff), - PAT(0x00ffff00), - PAT(0x00ffffff), - PAT(0xff000000), - PAT(0xff0000ff), - PAT(0xff00ff00), - PAT(0xff00ffff), - PAT(0xffff0000), - PAT(0xffff00ff), - PAT(0xffffff00), - PAT(0xffffffff), -}; - -static const uint32_t dmask4[4] = { - PAT(0x00000000), - PAT(0x0000ffff), - PAT(0xffff0000), - PAT(0xffffffff), -}; - static uint32_t expand4[256]; static uint16_t expand2[256]; static uint8_t expand4to8[16];
Following cleanup of the vga device code in commit d2e043a8041, the arrays dmask4 and dmask16 are now unused. gcc doesn't warn about this, but clang does; remove them. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/display/vga.c | 26 -------------------------- 1 file changed, 26 deletions(-)