Skip to contentSkip to conversation

pcmcia/at91_cf: don't redefine SZ_2K

PATCH New Uwe Kleine-König 3 participants 7 messages Dec 20, 2009 – Jan 22, 2010

Subsystems (2)
Arm/Microchip (AT91) SoC support Pcmcia
lore
Share & tools
lore

Uwe Kleine-König

author
#0 lore raw

PATCH 1/1 pcmcia/at91_cf: don't redefine SZ_2K

This fixes:

	drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined

Since

c1191b0 ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM)

SZ_2K is defined in arch/arm/include/asm/sizes.h.

Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
 drivers/pcmcia/at91_cf.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/pcmcia/at91_cf.c +0 -2
index e1dcced..5d22807 100644
@@ -52,8 +52,6 @@ struct at91_cf_socket {
 	unsigned long		phys_baseaddr;
 };
 
-#define	SZ_2K			(2 * SZ_1K)
-
 static inline int at91_cf_present(struct at91_cf_socket *cf)
 {
 	return !gpio_get_value(cf->board->det_pin);
Signature · 1 line
1.6.5.2
#1 lore raw

PATCH 1/1 pcmcia/at91_cf: don't redefine SZ_2K

Quoted 7 lines · Uwe Kleine-K?nig

This fixes:

	drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined

Since

c1191b0 ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM)

Have you checked whether everything which uses at91_cf still builds after this patch has been applied (eg, AVR32 stuff?)

author
#2 lore raw

PATCH 1/1 pcmcia/at91_cf: don't redefine SZ_2K

Quoted 11 lines · Russell King - ARM Linux
Quoted 7 lines · Uwe Kleine-K?nig

This fixes:

	drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined

Since

c1191b0 ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM)

Have you checked whether everything which uses at91_cf still builds after this patch has been applied (eg, AVR32 stuff?)

I wasn't aware that the driver is used on AVR32, too.

Hmmmm, drivers/pcmcia/Kconfig has:

	config AT91_CF
		tristate "AT91 CompactFlash Controller"
		depends on PCMCIA && ARCH_AT91RM9200
		...

So unless ARCH_AT91RM9200 is used on AVR32 there is no problem. Moreover AVR32 doesn't seem to provide <asm/sizes.h>.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |
#3 lore raw

PATCH 1/1 pcmcia/at91_cf: don't redefine SZ_2K

hi,

Quoted 4 lines
Quoted 2 lines

Have you checked whether everything which uses at91_cf still builds after this patch has been applied (eg, AVR32 stuff?)

I wasn't aware that the driver is used on AVR32, too.

I don't think the AVR32 arch uses this driver. So the patch should be fine to apply.

Regards,
Andrew Victor

author
#4 lore raw

PATCH 1/1 pcmcia/at91_cf: don't redefine SZ_2K

Quoted 8 lines · Andrew Victor

hi,

Quoted 4 lines
Quoted 2 lines

Have you checked whether everything which uses at91_cf still builds after this patch has been applied (eg, AVR32 stuff?)

I wasn't aware that the driver is used on AVR32, too.

I don't think the AVR32 arch uses this driver. So the patch should be fine to apply.

I assume this is an Ack?

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |
#5 lore raw

PATCH 1/1 pcmcia/at91_cf: don't redefine SZ_2K

hi,

Quoted 3 lines
Quoted 2 lines

I don't think the AVR32 arch uses this driver. ?So the patch should be fine to apply.

I assume this is an Ack?

Sure.

Acked-by Andrew Victor <[email protected]>
author
#6 lore raw

PATCH 1/1 pcmcia/at91_cf: don't redefine SZ_2K

This fixes:

	drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined

Since

c1191b0 ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM)

SZ_2K is defined in arch/arm/include/asm/sizes.h.

Signed-off-by Uwe Kleine-K?nig <[email protected]>
Acked-by Andrew Victor <[email protected]>
---
 drivers/pcmcia/at91_cf.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/pcmcia/at91_cf.c +0 -2
index e1dcced..5d22807 100644
@@ -52,8 +52,6 @@ struct at91_cf_socket {
 	unsigned long		phys_baseaddr;
 };
 
-#define	SZ_2K			(2 * SZ_1K)
-
 static inline int at91_cf_present(struct at91_cf_socket *cf)
 {
 	return !gpio_get_value(cf->board->det_pin);
Signature · 1 line
1.6.6