[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[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)

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

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 drivers/pcmcia/at91_cf.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index e1dcced..5d22807 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -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);
-- 
1.6.5.2

[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[Russell King - ARM Linux]

On Sun, Dec 20, 2009 at 10:10:34PM +0100, Uwe Kleine-K?nig wrote:
> 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?)

[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[Uwe Kleine-König]

On Tue, Dec 22, 2009 at 03:28:27PM +0000, Russell King - ARM Linux wrote:
> On Sun, Dec 20, 2009 at 10:10:34PM +0100, Uwe Kleine-K?nig wrote:
> > 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

-- 
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |

[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[Andrew Victor]

hi,
>> 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

[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[Uwe Kleine-König]

On Wed, Dec 23, 2009 at 10:26:56PM +0200, Andrew Victor wrote:
> hi,
> >> 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

-- 
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |

[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[Andrew Victor]

hi,

>> 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 <linux@maxim.org.za>

[PATCH] pcmcia/at91_cf: don't redefine SZ_2K

[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)

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

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Acked-by: Andrew Victor <linux@maxim.org.za>
---
 drivers/pcmcia/at91_cf.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index e1dcced..5d22807 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -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);
-- 
1.6.6