projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
[powerpc.git]
/
drivers
/
mtd
/
maps
/
ixp2000.c
diff --git
a/drivers/mtd/maps/ixp2000.c
b/drivers/mtd/maps/ixp2000.c
index
00b9f67
..
fc7a78e
100644
(file)
--- a/
drivers/mtd/maps/ixp2000.c
+++ b/
drivers/mtd/maps/ixp2000.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: ixp2000.c,v 1.
6 2005/03/18 14:07:46
gleixner Exp $
+ * $Id: ixp2000.c,v 1.
9 2005/11/07 11:14:27
gleixner Exp $
*
* drivers/mtd/maps/ixp2000.c
*
*
* drivers/mtd/maps/ixp2000.c
*
@@
-14,7
+14,7
@@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
- *
+ *
*/
#include <linux/module.h>
*/
#include <linux/module.h>
@@
-46,8
+46,8
@@
struct ixp2000_flash_info {
};
static inline unsigned long flash_bank_setup(struct map_info *map, unsigned long ofs)
};
static inline unsigned long flash_bank_setup(struct map_info *map, unsigned long ofs)
-{
- unsigned long (*set_bank)(unsigned long) =
+{
+ unsigned long (*set_bank)(unsigned long) =
(unsigned long(*)(unsigned long))map->map_priv_2;
return (set_bank ? set_bank(ofs) : ofs);
(unsigned long(*)(unsigned long))map->map_priv_2;
return (set_bank ? set_bank(ofs) : ofs);
@@
-55,8
+55,8
@@
static inline unsigned long flash_bank_setup(struct map_info *map, unsigned long
#ifdef __ARMEB__
/*
#ifdef __ARMEB__
/*
- * Rev A0 and A1 of IXP2400 silicon have a broken addressing unit which
- * causes the lower address bits to be XORed with 0x11 on 8 bit accesses
+ * Rev A0 and A1 of IXP2400 silicon have a broken addressing unit which
+ * causes the lower address bits to be XORed with 0x11 on 8 bit accesses
* and XORed with 0x10 on 16 bit accesses. See the spec update, erratum 44.
*/
static int erratum44_workaround = 0;
* and XORed with 0x10 on 16 bit accesses. See the spec update, erratum 44.
*/
static int erratum44_workaround = 0;
@@
-90,7
+90,7
@@
static void ixp2000_flash_copy_from(struct map_info *map, void *to,
unsigned long from, ssize_t len)
{
from = flash_bank_setup(map, from);
unsigned long from, ssize_t len)
{
from = flash_bank_setup(map, from);
- while(len--)
+ while(len--)
*(__u8 *) to++ = *(__u8 *)(map->map_priv_1 + from++);
}
*(__u8 *) to++ = *(__u8 *)(map->map_priv_1 + from++);
}
@@
-111,13
+111,12
@@
static void ixp2000_flash_copy_to(struct map_info *map, unsigned long to,
}
}
-static int ixp2000_flash_remove(struct
device *_
dev)
+static int ixp2000_flash_remove(struct
platform_device *
dev)
{
{
- struct platform_device *dev = to_platform_device(_dev);
struct flash_platform_data *plat = dev->dev.platform_data;
struct flash_platform_data *plat = dev->dev.platform_data;
- struct ixp2000_flash_info *info =
dev_get_drvdata(&dev->
dev);
+ struct ixp2000_flash_info *info =
platform_get_drvdata(
dev);
-
dev_set_drvdata(&dev->
dev, NULL);
+
platform_set_drvdata(
dev, NULL);
if(!info)
return 0;
if(!info)
return 0;
@@
-129,8
+128,7
@@
static int ixp2000_flash_remove(struct device *_dev)
if (info->map.map_priv_1)
iounmap((void *) info->map.map_priv_1);
if (info->map.map_priv_1)
iounmap((void *) info->map.map_priv_1);
- if (info->partitions) {
- kfree(info->partitions); }
+ kfree(info->partitions);
if (info->res) {
release_resource(info->res);
if (info->res) {
release_resource(info->res);
@@
-144,16
+142,15
@@
static int ixp2000_flash_remove(struct device *_dev)
}
}
-static int ixp2000_flash_probe(struct
device *_
dev)
+static int ixp2000_flash_probe(struct
platform_device *
dev)
{
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
{
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
- struct platform_device *dev = to_platform_device(_dev);
struct ixp2000_flash_data *ixp_data = dev->dev.platform_data;
struct ixp2000_flash_data *ixp_data = dev->dev.platform_data;
- struct flash_platform_data *plat;
+ struct flash_platform_data *plat;
struct ixp2000_flash_info *info;
unsigned long window_size;
int err = -1;
struct ixp2000_flash_info *info;
unsigned long window_size;
int err = -1;
-
+
if (!ixp_data)
return -ENODEV;
if (!ixp_data)
return -ENODEV;
@@
-162,7
+159,7
@@
static int ixp2000_flash_probe(struct device *_dev)
return -ENODEV;
window_size = dev->resource->end - dev->resource->start + 1;
return -ENODEV;
window_size = dev->resource->end - dev->resource->start + 1;
- dev_info(_dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
+ dev_info(_dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
ixp_data->nr_banks, ((u32)window_size >> 20));
if (plat->width != 1) {
ixp_data->nr_banks, ((u32)window_size >> 20));
if (plat->width != 1) {
@@
-175,17
+172,17
@@
static int ixp2000_flash_probe(struct device *_dev)
if(!info) {
err = -ENOMEM;
goto Error;
if(!info) {
err = -ENOMEM;
goto Error;
- }
+ }
memzero(info, sizeof(struct ixp2000_flash_info));
memzero(info, sizeof(struct ixp2000_flash_info));
-
dev_set_drvdata(&dev->
dev, info);
+
platform_set_drvdata(
dev, info);
/*
* Tell the MTD layer we're not 1:1 mapped so that it does
* not attempt to do a direct access on us.
*/
info->map.phys = NO_XIP;
/*
* Tell the MTD layer we're not 1:1 mapped so that it does
* not attempt to do a direct access on us.
*/
info->map.phys = NO_XIP;
-
+
info->nr_banks = ixp_data->nr_banks;
info->map.size = ixp_data->nr_banks * window_size;
info->map.bankwidth = 1;
info->nr_banks = ixp_data->nr_banks;
info->map.size = ixp_data->nr_banks * window_size;
info->map.bankwidth = 1;
@@
-193,7
+190,7
@@
static int ixp2000_flash_probe(struct device *_dev)
/*
* map_priv_2 is used to store a ptr to to the bank_setup routine
*/
/*
* map_priv_2 is used to store a ptr to to the bank_setup routine
*/
- info->map.map_priv_2 = (
void __iomem *
) ixp_data->bank_setup;
+ info->map.map_priv_2 = (
unsigned long
) ixp_data->bank_setup;
info->map.name = dev->dev.bus_id;
info->map.read = ixp2000_flash_read8;
info->map.name = dev->dev.bus_id;
info->map.read = ixp2000_flash_read8;
@@
-201,8
+198,8
@@
static int ixp2000_flash_probe(struct device *_dev)
info->map.copy_from = ixp2000_flash_copy_from;
info->map.copy_to = ixp2000_flash_copy_to;
info->map.copy_from = ixp2000_flash_copy_from;
info->map.copy_to = ixp2000_flash_copy_to;
- info->res = request_mem_region(dev->resource->start,
- dev->resource->end - dev->resource->start + 1,
+ info->res = request_mem_region(dev->resource->start,
+ dev->resource->end - dev->resource->start + 1,
dev->dev.bus_id);
if (!info->res) {
dev_err(_dev, "Could not reserve memory region\n");
dev->dev.bus_id);
if (!info->res) {
dev_err(_dev, "Could not reserve memory region\n");
@@
-210,7
+207,7
@@
static int ixp2000_flash_probe(struct device *_dev)
goto Error;
}
goto Error;
}
- info->map.map_priv_1 =
ioremap(dev->resource->start,
+ info->map.map_priv_1 =
(unsigned long) ioremap(dev->resource->start,
dev->resource->end - dev->resource->start + 1);
if (!info->map.map_priv_1) {
dev_err(_dev, "Failed to ioremap flash region\n");
dev->resource->end - dev->resource->start + 1);
if (!info->map.map_priv_1) {
dev_err(_dev, "Failed to ioremap flash region\n");
@@
-249,25
+246,26
@@
static int ixp2000_flash_probe(struct device *_dev)
return 0;
Error:
return 0;
Error:
- ixp2000_flash_remove(
_
dev);
+ ixp2000_flash_remove(dev);
return err;
}
return err;
}
-static struct device_driver ixp2000_flash_driver = {
- .name = "IXP2000-Flash",
- .bus = &platform_bus_type,
+static struct platform_driver ixp2000_flash_driver = {
.probe = &ixp2000_flash_probe,
.remove = &ixp2000_flash_remove
.probe = &ixp2000_flash_probe,
.remove = &ixp2000_flash_remove
+ .driver = {
+ .name = "IXP2000-Flash",
+ },
};
static int __init ixp2000_flash_init(void)
{
};
static int __init ixp2000_flash_init(void)
{
- return driver_register(&ixp2000_flash_driver);
+ return
platform_
driver_register(&ixp2000_flash_driver);
}
static void __exit ixp2000_flash_exit(void)
{
}
static void __exit ixp2000_flash_exit(void)
{
- driver_unregister(&ixp2000_flash_driver);
+
platform_
driver_unregister(&ixp2000_flash_driver);
}
module_init(ixp2000_flash_init);
}
module_init(ixp2000_flash_init);