diff options
Diffstat (limited to 'drivers/mtd/maps/ixp4xx.c')
-rw-r--r-- | drivers/mtd/maps/ixp4xx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c index c510c736ed97..471553a3da69 100644 --- a/drivers/mtd/maps/ixp4xx.c +++ b/drivers/mtd/maps/ixp4xx.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: ixp4xx.c,v 1.11 2005/11/06 11:15:51 gleixner Exp $ | 2 | * $Id: ixp4xx.c,v 1.12 2005/11/07 11:14:27 gleixner Exp $ |
3 | * | 3 | * |
4 | * drivers/mtd/maps/ixp4xx.c | 4 | * drivers/mtd/maps/ixp4xx.c |
5 | * | 5 | * |
@@ -72,7 +72,7 @@ static void ixp4xx_copy_from(struct map_info *map, void *to, | |||
72 | dest[len - 1] = BYTE0(le16_to_cpu(readw(src + 2*i))); | 72 | dest[len - 1] = BYTE0(le16_to_cpu(readw(src + 2*i))); |
73 | } | 73 | } |
74 | 74 | ||
75 | /* | 75 | /* |
76 | * Unaligned writes are ignored, causing the 8-bit | 76 | * Unaligned writes are ignored, causing the 8-bit |
77 | * probe to fail and proceed to the 16-bit probe (which succeeds). | 77 | * probe to fail and proceed to the 16-bit probe (which succeeds). |
78 | */ | 78 | */ |
@@ -82,7 +82,7 @@ static void ixp4xx_probe_write16(struct map_info *map, map_word d, unsigned long | |||
82 | writew(cpu_to_le16(d.x[0]), map->virt + adr); | 82 | writew(cpu_to_le16(d.x[0]), map->virt + adr); |
83 | } | 83 | } |
84 | 84 | ||
85 | /* | 85 | /* |
86 | * Fast write16 function without the probing check above | 86 | * Fast write16 function without the probing check above |
87 | */ | 87 | */ |
88 | static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr) | 88 | static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr) |
@@ -151,7 +151,7 @@ static int ixp4xx_flash_probe(struct device *_dev) | |||
151 | if(!info) { | 151 | if(!info) { |
152 | err = -ENOMEM; | 152 | err = -ENOMEM; |
153 | goto Error; | 153 | goto Error; |
154 | } | 154 | } |
155 | memzero(info, sizeof(struct ixp4xx_flash_info)); | 155 | memzero(info, sizeof(struct ixp4xx_flash_info)); |
156 | 156 | ||
157 | dev_set_drvdata(&dev->dev, info); | 157 | dev_set_drvdata(&dev->dev, info); |
@@ -174,8 +174,8 @@ static int ixp4xx_flash_probe(struct device *_dev) | |||
174 | info->map.write = ixp4xx_probe_write16, | 174 | info->map.write = ixp4xx_probe_write16, |
175 | info->map.copy_from = ixp4xx_copy_from, | 175 | info->map.copy_from = ixp4xx_copy_from, |
176 | 176 | ||
177 | info->res = request_mem_region(dev->resource->start, | 177 | info->res = request_mem_region(dev->resource->start, |
178 | dev->resource->end - dev->resource->start + 1, | 178 | dev->resource->end - dev->resource->start + 1, |
179 | "IXP4XXFlash"); | 179 | "IXP4XXFlash"); |
180 | if (!info->res) { | 180 | if (!info->res) { |
181 | printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n"); | 181 | printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n"); |
@@ -198,7 +198,7 @@ static int ixp4xx_flash_probe(struct device *_dev) | |||
198 | goto Error; | 198 | goto Error; |
199 | } | 199 | } |
200 | info->mtd->owner = THIS_MODULE; | 200 | info->mtd->owner = THIS_MODULE; |
201 | 201 | ||
202 | /* Use the fast version */ | 202 | /* Use the fast version */ |
203 | info->map.write = ixp4xx_write16, | 203 | info->map.write = ixp4xx_write16, |
204 | 204 | ||