diff mbox

[U-Boot,1/8] PPC: Fix tqm8xx_pcmcia.c by removing condition around pcmp

Message ID 1317603450-7527-2-git-send-email-marek.vasut@gmail.com
State Changes Requested
Headers show

Commit Message

Marek Vasut Oct. 3, 2011, 12:57 a.m. UTC
From: Marek Vasut <marex@pollux.denx.de>

This fix has no impact on u-boot.bin size (tested with ELDK 4.2).

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 drivers/pcmcia/tqm8xx_pcmcia.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Comments

Wolfgang Denk Oct. 3, 2011, 2:26 p.m. UTC | #1
Dear Marek Vasut,

In message <1317603450-7527-2-git-send-email-marek.vasut@gmail.com> you wrote:
> From: Marek Vasut <marex@pollux.denx.de>

Please make sure to use only valid mail addresses.


> This fix has no impact on u-boot.bin size (tested with ELDK 4.2).
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>  drivers/pcmcia/tqm8xx_pcmcia.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)

Um... this modification increases the code size;

before (commit b30d41c):

$ size u-boot
   text    data     bss     dec     hex filename
 260519   13960   25704  300183   49497 /work/wd/tmp-ppc/u-boot
$ size drivers/pcmcia/tqm8xx_pcmcia.o
   text    data     bss     dec     hex filename
    655      16       0     671     29f /work/wd/tmp-ppc/drivers/pcmcia/tqm8xx_pcmcia.o

After:

$ size u-boot
   text    data     bss     dec     hex filename
 260543   13960   25704  300207   494af /work/wd/tmp-ppc/u-boot
$ size drivers/pcmcia/tqm8xx_pcmcia.o
   text    data     bss     dec     hex filename
    683      16       0     699     2bb /work/wd/tmp-ppc/drivers/pcmcia/tqm8xx_pcmcia.o

I'm not willing to accept a code size increase (especially when DEBUG
is not even defined!)  for such a change.


Please find a better way to fix the problems introduced by commit
60ce53c... GCC4.6: Convert various empty macros to inline functions



Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c
index ca1a9fe..2e997dd 100644
--- a/drivers/pcmcia/tqm8xx_pcmcia.c
+++ b/drivers/pcmcia/tqm8xx_pcmcia.c
@@ -227,10 +227,8 @@  int pcmcia_voltage_set(int slot, int vcc, int vpp)
 {
 #ifndef CONFIG_NSCU
 	u_long reg;
-# ifdef DEBUG
 	volatile pcmconf8xx_t *pcmp =
 		(pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
-# endif
 
 	debug ("voltage_set: " PCMCIA_BOARD_MSG
 		" Slot %c, Vcc=%d.%d, Vpp=%d.%d\n",