[MTD] maps: Clean up trailing white spaces
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:

committed by
Thomas Gleixner

parent
1f948b43f7
commit
69f34c98c1
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: ixp2000.c,v 1.8 2005/11/07 08:09:02 gleixner Exp $
|
||||
* $Id: ixp2000.c,v 1.9 2005/11/07 11:14:27 gleixner Exp $
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#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)
|
||||
{
|
||||
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);
|
||||
@@ -55,8 +55,8 @@ static inline unsigned long flash_bank_setup(struct map_info *map, unsigned long
|
||||
|
||||
#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;
|
||||
@@ -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);
|
||||
while(len--)
|
||||
while(len--)
|
||||
*(__u8 *) to++ = *(__u8 *)(map->map_priv_1 + from++);
|
||||
}
|
||||
|
||||
@@ -149,11 +149,11 @@ static int ixp2000_flash_probe(struct device *_dev)
|
||||
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 flash_platform_data *plat;
|
||||
struct flash_platform_data *plat;
|
||||
struct ixp2000_flash_info *info;
|
||||
unsigned long window_size;
|
||||
int err = -1;
|
||||
|
||||
|
||||
if (!ixp_data)
|
||||
return -ENODEV;
|
||||
|
||||
@@ -162,7 +162,7 @@ static int ixp2000_flash_probe(struct device *_dev)
|
||||
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) {
|
||||
@@ -175,7 +175,7 @@ static int ixp2000_flash_probe(struct device *_dev)
|
||||
if(!info) {
|
||||
err = -ENOMEM;
|
||||
goto Error;
|
||||
}
|
||||
}
|
||||
memzero(info, sizeof(struct ixp2000_flash_info));
|
||||
|
||||
dev_set_drvdata(&dev->dev, info);
|
||||
@@ -185,7 +185,7 @@ static int ixp2000_flash_probe(struct device *_dev)
|
||||
* 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;
|
||||
@@ -201,8 +201,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->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");
|
||||
@@ -210,7 +210,7 @@ static int ixp2000_flash_probe(struct device *_dev)
|
||||
goto Error;
|
||||
}
|
||||
|
||||
info->map.map_priv_1 = (unsigned long) 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");
|
||||
|
Reference in New Issue
Block a user