From 28f0950782c0bec5aacfd556d321db50c96c9f4e Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 26 Nov 2008 13:12:50 -0800 Subject: [PATCH] --- yaml --- r: 128153 b: refs/heads/master c: c80a7b265fedef584a1bb8baf92a5b289a66e039 h: refs/heads/master i: 128151: 8763e2a956765db48966ef17c357c72d247ba1ba v: v3 --- [refs] | 2 +- trunk/drivers/mtd/rfd_ftl.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 66974cbcb497..347e981b65cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bc4382ae901311fe53be5735026cbe3ea6f235f +refs/heads/master: c80a7b265fedef584a1bb8baf92a5b289a66e039 diff --git a/trunk/drivers/mtd/rfd_ftl.c b/trunk/drivers/mtd/rfd_ftl.c index 490b4742ce3a..d2aa9c46530f 100644 --- a/trunk/drivers/mtd/rfd_ftl.c +++ b/trunk/drivers/mtd/rfd_ftl.c @@ -21,8 +21,6 @@ #include -#define const_cpu_to_le16 __constant_cpu_to_le16 - static int block_size = 0; module_param(block_size, int, 0); MODULE_PARM_DESC(block_size, "Block size to use by RFD, defaults to erase unit size"); @@ -298,7 +296,7 @@ static void erase_callback(struct erase_info *erase) return; } - magic = const_cpu_to_le16(RFD_MAGIC); + magic = cpu_to_le16(RFD_MAGIC); part->blocks[i].state = BLOCK_ERASED; part->blocks[i].free_sectors = part->data_sectors_per_block; @@ -588,7 +586,7 @@ static int mark_sector_deleted(struct partition *part, u_long old_addr) int block, offset, rc; u_long addr; size_t retlen; - u16 del = const_cpu_to_le16(SECTOR_DELETED); + u16 del = cpu_to_le16(SECTOR_DELETED); block = old_addr / part->block_size; offset = (old_addr % part->block_size) / SECTOR_SIZE -