sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

drivers/mtd: cosmetic changes 

Fix whitespace, replace all debug() by dev_dbg(), and fix
line length to 80 characters.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Robert Jarzmik 2011-12-21 22:30:39 +01:00 committed by Sascha Hauer
parent 8ccde79470
commit f76ad819e4
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/mtd/core.c
View File

@ -14,11 +14,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <common.h>
#include <linux/mtd/nand.h>
@ -31,7 +26,8 @@
#include <nand.h>
#include <errno.h>
static ssize_t nand_read(struct cdev *cdev, void* buf, size_t count, ulong offset, ulong flags)
static ssize_t nand_read(struct cdev *cdev, void* buf, size_t count,
ulong offset, ulong flags)
{
struct mtd_info *info = cdev->priv;
size_t retlen;
@ -49,6 +45,7 @@ static ssize_t nand_read(struct cdev *cdev, void* buf, size_t count, ulong offs
}
#define NOTALIGNED(x) (x & (info->writesize - 1)) != 0
#define MTDPGALG(x) ((x) & (info->writesize - 1))
#ifdef CONFIG_NAND_WRITE
static int all_ff(const void *buf, int len)
@ -62,7 +59,8 @@ static int all_ff(const void *buf, int len)
return 1;
}
static ssize_t nand_write(struct cdev* cdev, const void *buf, size_t _count, ulong offset, ulong flags)
static ssize_t nand_write(struct cdev* cdev, const void *buf, size_t _count,
ulong offset, ulong flags)
{
struct mtd_info *info = cdev->priv;
size_t retlen, now;
@ -75,24 +73,29 @@ static ssize_t nand_write(struct cdev* cdev, const void *buf, size_t _count, ulo
return -EINVAL;
}
debug("write: 0x%08lx 0x%08x\n", offset, count);
dev_dbg(cdev->dev, "write: 0x%08lx 0x%08x\n", offset, count);
while (count) {
now = count > info->writesize ? info->writesize : count;
if (NOTALIGNED(now)) {
debug("not aligned: %d %ld\n", info->writesize, (offset % info->writesize));
dev_dbg(cdev->dev, "not aligned: %d %ld\n",
info->writesize,
(offset % info->writesize));
wrbuf = xmalloc(info->writesize);
memset(wrbuf, 0xff, info->writesize);
memcpy(wrbuf + (offset % info->writesize), buf, now);
if (!all_ff(wrbuf, info->writesize))
ret = info->write(info, offset & ~(info->writesize - 1),
info->writesize, &retlen, wrbuf);
ret = info->write(info, MTDPGALG(offset),
info->writesize, &retlen,
wrbuf);
free(wrbuf);
} else {
if (!all_ff(buf, info->writesize))
ret = info->write(info, offset, now, &retlen, buf);
debug("offset: 0x%08lx now: 0x%08x retlen: 0x%08x\n", offset, now, retlen);
ret = info->write(info, offset, now, &retlen,
buf);
dev_dbg(cdev->dev,
"offset: 0x%08lx now: 0x%08x retlen: 0x%08x\n",
offset, now, retlen);
}
if (ret)
goto out;
@ -114,11 +117,11 @@ static int nand_ioctl(struct cdev *cdev, int request, void *buf)
switch (request) {
case MEMGETBADBLOCK:
debug("MEMGETBADBLOCK: 0x%08lx\n", (off_t)buf);
dev_dbg(cdev->dev, "MEMGETBADBLOCK: 0x%08lx\n", (off_t)buf);
return info->block_isbad(info, (off_t)buf);
#ifdef CONFIG_NAND_WRITE
case MEMSETBADBLOCK:
debug("MEMSETBADBLOCK: 0x%08lx\n", (off_t)buf);
dev_dbg(cdev->dev, "MEMSETBADBLOCK: 0x%08lx\n", (off_t)buf);
return info->block_markbad(info, (off_t)buf);
#endif
case MEMGETINFO:
@ -150,7 +153,7 @@ static ssize_t nand_erase(struct cdev *cdev, size_t count, unsigned long offset)
erase.len = info->erasesize;
while (count > 0) {
debug("erase %d %d\n", erase.addr, erase.len);
dev_dbg(cdev->dev, "erase %d %d\n", erase.addr, erase.len);
ret = info->block_isbad(info, erase.addr);
if (ret > 0) {
@ -169,13 +172,6 @@ static ssize_t nand_erase(struct cdev *cdev, size_t count, unsigned long offset)
}
#endif
#if 0
static char* mtd_get_size(struct device_d *, struct param_d *param)
{
static char
}
#endif
static struct file_operations nand_ops = {
.read = nand_read,
#ifdef CONFIG_NAND_WRITE
@ -187,7 +183,8 @@ static struct file_operations nand_ops = {
};
#ifdef CONFIG_NAND_OOB_DEVICE
static ssize_t nand_read_oob(struct cdev *cdev, void *buf, size_t count, ulong offset, ulong flags)
static ssize_t nand_read_oob(struct cdev *cdev, void *buf, size_t count,
ulong offset, ulong flags)
{
struct mtd_info *info = cdev->priv;
struct nand_chip *chip = info->priv;