git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
ixp4xx.c
diff --git
a/drivers/mtd/maps/ixp4xx.c
b/drivers/mtd/maps/ixp4xx.c
index
a10f921
..
7ebc8cc
100644
(file)
--- a/
drivers/mtd/maps/ixp4xx.c
+++ b/
drivers/mtd/maps/ixp4xx.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: ixp4xx.c,v 1.
1 2004/05/13 22:21:26 dsaxena
Exp $
+ * $Id: ixp4xx.c,v 1.
3 2004/07/12 22:38:29 dwmw2
Exp $
*
* drivers/mtd/maps/ixp4xx.c
*
*
* drivers/mtd/maps/ixp4xx.c
*
@@
-39,10
+39,11
@@
#define BYTE1(h) ((h) & 0xFF)
#endif
#define BYTE1(h) ((h) & 0xFF)
#endif
-static __u16
-ixp4xx_read16(struct map_info *map, unsigned long ofs)
+static map_word ixp4xx_read16(struct map_info *map, unsigned long ofs)
{
{
- return *(__u16 *) (map->map_priv_1 + ofs);
+ map_word val;
+ val.x[0] = *(__u16 *) (map->map_priv_1 + ofs);
+ return val;
}
/*
}
/*
@@
-50,9
+51,8
@@
ixp4xx_read16(struct map_info *map, unsigned long ofs)
* when attached to a 16-bit wide device (such as the 28F128J3A),
* so we can't just memcpy_fromio().
*/
* when attached to a 16-bit wide device (such as the 28F128J3A),
* so we can't just memcpy_fromio().
*/
-static void
-ixp4xx_copy_from(struct map_info *map, void *to,
- unsigned long from, ssize_t len)
+static void ixp4xx_copy_from(struct map_info *map, void *to,
+ unsigned long from, ssize_t len)
{
int i;
u8 *dest = (u8 *) to;
{
int i;
u8 *dest = (u8 *) to;
@@
-69,10
+69,9
@@
ixp4xx_copy_from(struct map_info *map, void *to,
dest[len - 1] = BYTE0(src[i]);
}
dest[len - 1] = BYTE0(src[i]);
}
-static void
-ixp4xx_write16(struct map_info *map, __u16 d, unsigned long adr)
+static void ixp4xx_write16(struct map_info *map, map_word d, unsigned long adr)
{
{
- *(__u16 *) (map->map_priv_1 + adr) = d;
+ *(__u16 *) (map->map_priv_1 + adr) = d
.x[0]
;
}
struct ixp4xx_flash_info {
}
struct ixp4xx_flash_info {
@@
-84,8
+83,7
@@
struct ixp4xx_flash_info {
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
-static int
-ixp4xx_flash_remove(struct device *_dev)
+static int ixp4xx_flash_remove(struct device *_dev)
{
struct platform_device *dev = to_platform_device(_dev);
struct flash_platform_data *plat = dev->dev.platform_data;
{
struct platform_device *dev = to_platform_device(_dev);
struct flash_platform_data *plat = dev->dev.platform_data;
@@
-168,10
+166,10
@@
static int ixp4xx_flash_probe(struct device *_dev)
* any board use 8-bit access, we'll fixup the driver to
* handle that.
*/
* any board use 8-bit access, we'll fixup the driver to
* handle that.
*/
- info->map.b
us
width = 2;
+ info->map.b
ank
width = 2;
info->map.name = dev->dev.bus_id;
info->map.name = dev->dev.bus_id;
- info->map.read
16
= ixp4xx_read16,
- info->map.write
16
= ixp4xx_write16,
+ info->map.read = ixp4xx_read16,
+ info->map.write = ixp4xx_write16,
info->map.copy_from = ixp4xx_copy_from,
info->res = request_mem_region(dev->resource->start,
info->map.copy_from = ixp4xx_copy_from,
info->res = request_mem_region(dev->resource->start,