Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3363997 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Dominik Brodowski
Browse files

pcmcia: fix Alchemy warnings 



Fix the following warnings:

drivers/pcmcia/au1000_generic.c: In function `au1x00_pcmcia_socket_probe':
drivers/pcmcia/au1000_generic.c:405: warning: integer constant is too large for
"long" type
drivers/pcmcia/au1000_generic.c:413: warning: integer constant is too large for
"long" type

by properly postfixing the socket constants. While at it, fix the lines over 80
characters long in the vicinity...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent f36fe2b9

drivers/pcmcia/au1000_generic.h

+15 −11
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
#define AU1000_PCMCIA_IO_SPEED       (255)

#define AU1000_PCMCIA_MEM_SPEED      (300)



#define AU1X_SOCK0_IO        0xF00000000

#define AU1X_SOCK0_PHYS_ATTR 0xF40000000

#define AU1X_SOCK0_PHYS_MEM  0xF80000000

#define AU1X_SOCK0_IO        0xF00000000ULL

#define AU1X_SOCK0_PHYS_ATTR 0xF40000000ULL

#define AU1X_SOCK0_PHYS_MEM  0xF80000000ULL

/* pseudo 32 bit phys addresses, which get fixed up to the

 * real 36 bit address in fixup_bigphys_addr() */

#define AU1X_SOCK0_PSEUDO_PHYS_ATTR 0xF4000000
@@ -45,16 +45,20 @@ 
/* pcmcia socket 1 needs external glue logic so the memory map

 * differs from board to board.

 */

#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_PB1200)

#define AU1X_SOCK1_IO        0xF08000000

#define AU1X_SOCK1_PHYS_ATTR 0xF48000000

#define AU1X_SOCK1_PHYS_MEM  0xF88000000

#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || \

    defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || \

    defined(CONFIG_MIPS_PB1200)

#define AU1X_SOCK1_IO        0xF08000000ULL

#define AU1X_SOCK1_PHYS_ATTR 0xF48000000ULL

#define AU1X_SOCK1_PHYS_MEM  0xF88000000ULL

#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000

#define AU1X_SOCK1_PSEUDO_PHYS_MEM  0xF8800000

#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || defined(CONFIG_MIPS_DB1200)

#define AU1X_SOCK1_IO        0xF04000000

#define AU1X_SOCK1_PHYS_ATTR 0xF44000000

#define AU1X_SOCK1_PHYS_MEM  0xF84000000

#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || \

      defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || \

      defined(CONFIG_MIPS_DB1200)

#define AU1X_SOCK1_IO        0xF04000000ULL

#define AU1X_SOCK1_PHYS_ATTR 0xF44000000ULL

#define AU1X_SOCK1_PHYS_MEM  0xF84000000ULL

#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4400000

#define AU1X_SOCK1_PSEUDO_PHYS_MEM  0xF8400000

#endif