mtd: update gfp/slab.h includes

[safe/jmp/linux-2.6] / drivers / mtd / nand / alauda.c

diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c
index 6d96491..8691e04 100644 (file)
--- a/drivers/mtd/nand/alauda.c
+++ b/drivers/mtd/nand/alauda.c
@@ -49,7 +49,7 @@
 
 #define TIMEOUT HZ
 
-static struct usb_device_id alauda_table [] = {
+static const struct usb_device_id alauda_table[] = {
        { USB_DEVICE(0x0584, 0x0008) }, /* Fujifilm DPC-R1 */
        { USB_DEVICE(0x07b4, 0x010a) }, /* Olympus MAUSB-10 */
        { }
@@ -372,15 +372,6 @@ static int alauda_read_oob(struct mtd_info *mtd, loff_t from, void *oob)
        return __alauda_read_page(mtd, from, ignore_buf, oob);
 }
 
-static int popcount8(u8 c)
-{
-       int ret = 0;
-
-       for ( ; c; c>>=1)
-               ret += c & 1;
-       return ret;
-}
-
 static int alauda_isbad(struct mtd_info *mtd, loff_t ofs)
 {
        u8 oob[16];
@@ -391,7 +382,7 @@ static int alauda_isbad(struct mtd_info *mtd, loff_t ofs)
                return err;
 
        /* A block is marked bad if two or more bits are zero */
-       return popcount8(oob[5]) >= 7 ? 0 : 1;
+       return hweight8(oob[5]) >= 7 ? 0 : 1;
 }
 
 static int alauda_bounce_read(struct mtd_info *mtd, loff_t from, size_t len,