[MTD] chips: Clean up trailing white spaces
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:

committed by
Thomas Gleixner

parent
e4f0648fb4
commit
1f948b43f7
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
/*
|
||||
Common Flash Interface probe code.
|
||||
(C) 2000 Red Hat. GPL'd.
|
||||
$Id: cfi_probe.c,v 1.83 2004/11/16 18:19:02 nico Exp $
|
||||
$Id: cfi_probe.c,v 1.84 2005/11/07 11:14:23 gleixner Exp $
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <linux/mtd/cfi.h>
|
||||
#include <linux/mtd/gen_probe.h>
|
||||
|
||||
//#define DEBUG_CFI
|
||||
//#define DEBUG_CFI
|
||||
|
||||
#ifdef DEBUG_CFI
|
||||
static void print_cfi_ident(struct cfi_ident *);
|
||||
@@ -103,7 +103,7 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
|
||||
unsigned long *chip_map, struct cfi_private *cfi)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
if ((base + 0) >= map->size) {
|
||||
printk(KERN_NOTICE
|
||||
"Probe at base[0x00](0x%08lx) past the end of the map(0x%08lx)\n",
|
||||
@@ -128,7 +128,7 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
|
||||
}
|
||||
|
||||
if (!cfi->numchips) {
|
||||
/* This is the first time we're called. Set up the CFI
|
||||
/* This is the first time we're called. Set up the CFI
|
||||
stuff accordingly and return */
|
||||
return cfi_chip_setup(map, cfi);
|
||||
}
|
||||
@@ -138,13 +138,13 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
|
||||
unsigned long start;
|
||||
if(!test_bit(i, chip_map)) {
|
||||
/* Skip location; no valid chip at this address */
|
||||
continue;
|
||||
continue;
|
||||
}
|
||||
start = i << cfi->chipshift;
|
||||
/* This chip should be in read mode if it's one
|
||||
we've already touched. */
|
||||
if (qry_present(map, start, cfi)) {
|
||||
/* Eep. This chip also had the QRY marker.
|
||||
/* Eep. This chip also had the QRY marker.
|
||||
* Is it an alias for the new one? */
|
||||
cfi_send_gen_cmd(0xF0, 0, start, map, cfi, cfi->device_type, NULL);
|
||||
cfi_send_gen_cmd(0xFF, 0, start, map, cfi, cfi->device_type, NULL);
|
||||
@@ -156,13 +156,13 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
|
||||
map->name, base, start);
|
||||
return 0;
|
||||
}
|
||||
/* Yes, it's actually got QRY for data. Most
|
||||
/* Yes, it's actually got QRY for data. Most
|
||||
* unfortunate. Stick the new chip in read mode
|
||||
* too and if it's the same, assume it's an alias. */
|
||||
/* FIXME: Use other modes to do a proper check */
|
||||
cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
|
||||
cfi_send_gen_cmd(0xFF, 0, start, map, cfi, cfi->device_type, NULL);
|
||||
|
||||
|
||||
if (qry_present(map, base, cfi)) {
|
||||
xip_allowed(base, map);
|
||||
printk(KERN_DEBUG "%s: Found an alias at 0x%x for the chip at 0x%lx\n",
|
||||
@@ -171,12 +171,12 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* OK, if we got to here, then none of the previous chips appear to
|
||||
be aliases for the current one. */
|
||||
set_bit((base >> cfi->chipshift), chip_map); /* Update chip map */
|
||||
cfi->numchips++;
|
||||
|
||||
|
||||
/* Put it back into Read Mode */
|
||||
cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
|
||||
cfi_send_gen_cmd(0xFF, 0, base, map, cfi, cfi->device_type, NULL);
|
||||
@@ -185,11 +185,11 @@ static int __xipram cfi_probe_chip(struct map_info *map, __u32 base,
|
||||
printk(KERN_INFO "%s: Found %d x%d devices at 0x%x in %d-bit bank\n",
|
||||
map->name, cfi->interleave, cfi->device_type*8, base,
|
||||
map->bankwidth*8);
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int __xipram cfi_chip_setup(struct map_info *map,
|
||||
static int __xipram cfi_chip_setup(struct map_info *map,
|
||||
struct cfi_private *cfi)
|
||||
{
|
||||
int ofs_factor = cfi->interleave*cfi->device_type;
|
||||
@@ -209,11 +209,11 @@ static int __xipram cfi_chip_setup(struct map_info *map,
|
||||
printk(KERN_WARNING "%s: kmalloc failed for CFI ident structure\n", map->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
memset(cfi->cfiq,0,sizeof(struct cfi_ident));
|
||||
|
||||
|
||||
memset(cfi->cfiq,0,sizeof(struct cfi_ident));
|
||||
|
||||
cfi->cfi_mode = CFI_MODE_CFI;
|
||||
|
||||
|
||||
/* Read the CFI info structure */
|
||||
xip_disable_qry(base, map, cfi);
|
||||
for (i=0; i<(sizeof(struct cfi_ident) + num_erase_regions * 4); i++)
|
||||
@@ -231,7 +231,7 @@ static int __xipram cfi_chip_setup(struct map_info *map,
|
||||
cfi_send_gen_cmd(0x55, 0x2aa, base, map, cfi, cfi->device_type, NULL);
|
||||
cfi_send_gen_cmd(0x90, 0x555, base, map, cfi, cfi->device_type, NULL);
|
||||
cfi->mfr = cfi_read_query(map, base);
|
||||
cfi->id = cfi_read_query(map, base + ofs_factor);
|
||||
cfi->id = cfi_read_query(map, base + ofs_factor);
|
||||
|
||||
/* Put it back into Read Mode */
|
||||
cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
|
||||
@@ -255,10 +255,10 @@ static int __xipram cfi_chip_setup(struct map_info *map,
|
||||
|
||||
for (i=0; i<cfi->cfiq->NumEraseRegions; i++) {
|
||||
cfi->cfiq->EraseRegionInfo[i] = le32_to_cpu(cfi->cfiq->EraseRegionInfo[i]);
|
||||
|
||||
#ifdef DEBUG_CFI
|
||||
|
||||
#ifdef DEBUG_CFI
|
||||
printk(" Erase Region #%d: BlockSize 0x%4.4X bytes, %d blocks\n",
|
||||
i, (cfi->cfiq->EraseRegionInfo[i] >> 8) & ~0xff,
|
||||
i, (cfi->cfiq->EraseRegionInfo[i] >> 8) & ~0xff,
|
||||
(cfi->cfiq->EraseRegionInfo[i] & 0xffff) + 1);
|
||||
#endif
|
||||
}
|
||||
@@ -271,33 +271,33 @@ static int __xipram cfi_chip_setup(struct map_info *map,
|
||||
}
|
||||
|
||||
#ifdef DEBUG_CFI
|
||||
static char *vendorname(__u16 vendor)
|
||||
static char *vendorname(__u16 vendor)
|
||||
{
|
||||
switch (vendor) {
|
||||
case P_ID_NONE:
|
||||
return "None";
|
||||
|
||||
|
||||
case P_ID_INTEL_EXT:
|
||||
return "Intel/Sharp Extended";
|
||||
|
||||
|
||||
case P_ID_AMD_STD:
|
||||
return "AMD/Fujitsu Standard";
|
||||
|
||||
|
||||
case P_ID_INTEL_STD:
|
||||
return "Intel/Sharp Standard";
|
||||
|
||||
|
||||
case P_ID_AMD_EXT:
|
||||
return "AMD/Fujitsu Extended";
|
||||
|
||||
case P_ID_WINBOND:
|
||||
return "Winbond Standard";
|
||||
|
||||
|
||||
case P_ID_ST_ADV:
|
||||
return "ST Advanced";
|
||||
|
||||
case P_ID_MITSUBISHI_STD:
|
||||
return "Mitsubishi Standard";
|
||||
|
||||
|
||||
case P_ID_MITSUBISHI_EXT:
|
||||
return "Mitsubishi Extended";
|
||||
|
||||
@@ -306,13 +306,13 @@ static char *vendorname(__u16 vendor)
|
||||
|
||||
case P_ID_INTEL_PERFORMANCE:
|
||||
return "Intel Performance Code";
|
||||
|
||||
|
||||
case P_ID_INTEL_DATA:
|
||||
return "Intel Data";
|
||||
|
||||
|
||||
case P_ID_RESERVED:
|
||||
return "Not Allowed / Reserved for Future Use";
|
||||
|
||||
|
||||
default:
|
||||
return "Unknown";
|
||||
}
|
||||
@@ -325,21 +325,21 @@ static void print_cfi_ident(struct cfi_ident *cfip)
|
||||
if (cfip->qry[0] != 'Q' || cfip->qry[1] != 'R' || cfip->qry[2] != 'Y') {
|
||||
printk("Invalid CFI ident structure.\n");
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
printk("Primary Vendor Command Set: %4.4X (%s)\n", cfip->P_ID, vendorname(cfip->P_ID));
|
||||
if (cfip->P_ADR)
|
||||
printk("Primary Algorithm Table at %4.4X\n", cfip->P_ADR);
|
||||
else
|
||||
printk("No Primary Algorithm Table\n");
|
||||
|
||||
|
||||
printk("Alternative Vendor Command Set: %4.4X (%s)\n", cfip->A_ID, vendorname(cfip->A_ID));
|
||||
if (cfip->A_ADR)
|
||||
printk("Alternate Algorithm Table at %4.4X\n", cfip->A_ADR);
|
||||
else
|
||||
printk("No Alternate Algorithm Table\n");
|
||||
|
||||
|
||||
|
||||
|
||||
printk("Vcc Minimum: %2d.%d V\n", cfip->VccMin >> 4, cfip->VccMin & 0xf);
|
||||
printk("Vcc Maximum: %2d.%d V\n", cfip->VccMax >> 4, cfip->VccMax & 0xf);
|
||||
if (cfip->VppMin) {
|
||||
@@ -348,61 +348,61 @@ static void print_cfi_ident(struct cfi_ident *cfip)
|
||||
}
|
||||
else
|
||||
printk("No Vpp line\n");
|
||||
|
||||
|
||||
printk("Typical byte/word write timeout: %d <20>s\n", 1<<cfip->WordWriteTimeoutTyp);
|
||||
printk("Maximum byte/word write timeout: %d <20>s\n", (1<<cfip->WordWriteTimeoutMax) * (1<<cfip->WordWriteTimeoutTyp));
|
||||
|
||||
|
||||
if (cfip->BufWriteTimeoutTyp || cfip->BufWriteTimeoutMax) {
|
||||
printk("Typical full buffer write timeout: %d <20>s\n", 1<<cfip->BufWriteTimeoutTyp);
|
||||
printk("Maximum full buffer write timeout: %d <20>s\n", (1<<cfip->BufWriteTimeoutMax) * (1<<cfip->BufWriteTimeoutTyp));
|
||||
}
|
||||
else
|
||||
printk("Full buffer write not supported\n");
|
||||
|
||||
|
||||
printk("Typical block erase timeout: %d ms\n", 1<<cfip->BlockEraseTimeoutTyp);
|
||||
printk("Maximum block erase timeout: %d ms\n", (1<<cfip->BlockEraseTimeoutMax) * (1<<cfip->BlockEraseTimeoutTyp));
|
||||
if (cfip->ChipEraseTimeoutTyp || cfip->ChipEraseTimeoutMax) {
|
||||
printk("Typical chip erase timeout: %d ms\n", 1<<cfip->ChipEraseTimeoutTyp);
|
||||
printk("Typical chip erase timeout: %d ms\n", 1<<cfip->ChipEraseTimeoutTyp);
|
||||
printk("Maximum chip erase timeout: %d ms\n", (1<<cfip->ChipEraseTimeoutMax) * (1<<cfip->ChipEraseTimeoutTyp));
|
||||
}
|
||||
else
|
||||
printk("Chip erase not supported\n");
|
||||
|
||||
|
||||
printk("Device size: 0x%X bytes (%d MiB)\n", 1 << cfip->DevSize, 1<< (cfip->DevSize - 20));
|
||||
printk("Flash Device Interface description: 0x%4.4X\n", cfip->InterfaceDesc);
|
||||
switch(cfip->InterfaceDesc) {
|
||||
case 0:
|
||||
printk(" - x8-only asynchronous interface\n");
|
||||
break;
|
||||
|
||||
|
||||
case 1:
|
||||
printk(" - x16-only asynchronous interface\n");
|
||||
break;
|
||||
|
||||
|
||||
case 2:
|
||||
printk(" - supports x8 and x16 via BYTE# with asynchronous interface\n");
|
||||
break;
|
||||
|
||||
|
||||
case 3:
|
||||
printk(" - x32-only asynchronous interface\n");
|
||||
break;
|
||||
|
||||
|
||||
case 4:
|
||||
printk(" - supports x16 and x32 via Word# with asynchronous interface\n");
|
||||
break;
|
||||
|
||||
|
||||
case 65535:
|
||||
printk(" - Not Allowed / Reserved\n");
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
printk(" - Unknown\n");
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
printk("Max. bytes in buffer write: 0x%x\n", 1<< cfip->MaxBufWriteSize);
|
||||
printk("Number of Erase Block Regions: %d\n", cfip->NumEraseRegions);
|
||||
|
||||
|
||||
}
|
||||
#endif /* DEBUG_CFI */
|
||||
|
||||
|
Reference in New Issue
Block a user