evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[MTD] Remove more strange u_intxx_t types

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2008-12-10 14:08:12 +00:00
parent 3854be7712
commit 26cdb67c74
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mtd/mtdconcat.c
View file

@ -696,7 +696,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c
int i; int i;
size_t size; size_t size;
struct mtd_concat *concat; struct mtd_concat *concat;
u_int32_t max_erasesize, curr_erasesize; uint32_t max_erasesize, curr_erasesize;
int num_erase_region; int num_erase_region;
printk(KERN_NOTICE "Concatenating MTD devices:\n"); printk(KERN_NOTICE "Concatenating MTD devices:\n");

26
include/linux/mtd/mtd.h
View file

@ -39,8 +39,8 @@ struct erase_info {
uint64_t fail_addr; uint64_t fail_addr;
u_long time; u_long time;
u_long retries; u_long retries;
u_int dev; unsigned dev;
u_int cell; unsigned cell;
void (*callback) (struct erase_info *self); void (*callback) (struct erase_info *self);
u_long priv; u_long priv;
u_char state; u_char state;
@ -49,8 +49,8 @@ struct erase_info {
struct mtd_erase_region_info { struct mtd_erase_region_info {
uint64_t offset; /* At which this region starts, from the beginning of the MTD */ uint64_t offset; /* At which this region starts, from the beginning of the MTD */
u_int32_t erasesize; /* For this region */ uint32_t erasesize; /* For this region */
u_int32_t numblocks; /* Number of blocks of erasesize in this region */ uint32_t numblocks; /* Number of blocks of erasesize in this region */
unsigned long *lockmap; /* If keeping bitmap of locks */ unsigned long *lockmap; /* If keeping bitmap of locks */
}; };
@ -102,14 +102,14 @@ struct mtd_oob_ops {
struct mtd_info { struct mtd_info {
u_char type; u_char type;
u_int32_t flags; uint32_t flags;
uint64_t size; // Total size of the MTD uint64_t size; // Total size of the MTD
/* "Major" erase size for the device. Naïve users may take this /* "Major" erase size for the device. Naïve users may take this
* to be the only erase size available, or may use the more detailed * to be the only erase size available, or may use the more detailed
* information below if they desire * information below if they desire
*/ */
u_int32_t erasesize; uint32_t erasesize;
/* Minimal writable flash unit size. In case of NOR flash it is 1 (even /* Minimal writable flash unit size. In case of NOR flash it is 1 (even
* though individual bits can be cleared), in case of NAND flash it is * though individual bits can be cleared), in case of NAND flash it is
* one NAND page (or half, or one-fourths of it), in case of ECC-ed NOR * one NAND page (or half, or one-fourths of it), in case of ECC-ed NOR
@ -117,10 +117,10 @@ struct mtd_info {
* Any driver registering a struct mtd_info must ensure a writesize of * Any driver registering a struct mtd_info must ensure a writesize of
* 1 or larger. * 1 or larger.
*/ */
u_int32_t writesize; uint32_t writesize;
u_int32_t oobsize; // Amount of OOB data per block (e.g. 16) uint32_t oobsize; // Amount of OOB data per block (e.g. 16)
u_int32_t oobavail; // Available OOB bytes per block uint32_t oobavail; // Available OOB bytes per block
/* /*
* If erasesize is a power of 2 then the shift is stored in * If erasesize is a power of 2 then the shift is stored in
@ -233,7 +233,7 @@ struct mtd_info {
void (*put_device) (struct mtd_info *mtd); void (*put_device) (struct mtd_info *mtd);
}; };
static inline u_int32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd) static inline uint32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
{ {
if (mtd->erasesize_shift) if (mtd->erasesize_shift)
return sz >> mtd->erasesize_shift; return sz >> mtd->erasesize_shift;
@ -241,14 +241,14 @@ static inline u_int32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
return sz; return sz;
} }
static inline u_int32_t mtd_mod_by_eb(uint64_t sz, struct mtd_info *mtd) static inline uint32_t mtd_mod_by_eb(uint64_t sz, struct mtd_info *mtd)
{ {
if (mtd->erasesize_shift) if (mtd->erasesize_shift)
return sz & mtd->erasesize_mask; return sz & mtd->erasesize_mask;
return do_div(sz, mtd->erasesize); return do_div(sz, mtd->erasesize);
} }
static inline u_int32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd) static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
{ {
if (mtd->writesize_shift) if (mtd->writesize_shift)
return sz >> mtd->writesize_shift; return sz >> mtd->writesize_shift;
@ -256,7 +256,7 @@ static inline u_int32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
return sz; return sz;
} }
static inline u_int32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd) static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd)
{ {
if (mtd->writesize_shift) if (mtd->writesize_shift)
return sz & mtd->writesize_mask; return sz & mtd->writesize_mask;

2
include/linux/mtd/partitions.h
View file

@ -38,7 +38,7 @@ struct mtd_partition {
char *name; /* identifier string */ char *name; /* identifier string */
uint64_t size; /* partition size */ uint64_t size; /* partition size */
uint64_t offset; /* offset within the master MTD space */ uint64_t offset; /* offset within the master MTD space */
u_int32_t mask_flags; /* master MTD flags to mask out for this partition */ uint32_t mask_flags; /* master MTD flags to mask out for this partition */
struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/ struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/
struct mtd_info **mtdp; /* pointer to store the MTD object */ struct mtd_info **mtdp; /* pointer to store the MTD object */
}; };