Changeset 17995

Timestamp:

12/09/11 17:46:59 (18 months ago)

Author:

eko

Message:

some flash fixes

File:

• src/linux/brcm/linux-2.6.23/drivers/mtd/chips/gen_probe.c (modified) (3 diffs)

src/linux/brcm/linux-2.6.23/drivers/mtd/chips/gen_probe.c

@@ -73 +73 @@
                 /* The probe didn't like it */
                 printk(KERN_DEBUG "%s: Found no %s device at location zero\n",
-                       cp->name, map->name);
+                         cp->name, map->name);
                 return NULL;
         }
@@ -113 +113 @@
         }
 
-        mapsize = (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG;
+        mapsize = sizeof(long) * DIV_ROUND_UP(max_chips, BITS_PER_LONG);
         chip_map = kzalloc(mapsize, GFP_KERNEL);
         if (!chip_map) {
@@ -244 +244 @@
                    because symbol_get() doesn't work there */
 #ifdef CONFIG_MTD_CFI_INTELEXT
-        case 0x0001:
-        case 0x0003:
-        case 0x0200:
+        case P_ID_INTEL_EXT:
+        case P_ID_INTEL_STD:
+        case P_ID_INTEL_PERFORMANCE:
                 return cfi_cmdset_0001(map, primary);
 #endif
 #ifdef CONFIG_MTD_CFI_AMDSTD
-        case 0x0002:
+        case P_ID_AMD_STD:
+        case P_ID_SST_OLD:
+        case P_ID_WINBOND:
                 return cfi_cmdset_0002(map, primary);
 #endif
 #ifdef CONFIG_MTD_CFI_STAA
-        case 0x0020:
+        case P_ID_ST_ADV:
                 return cfi_cmdset_0020(map, primary);
 #endif