aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-08-21 00:51:15 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-09-29 09:57:00 -0400
commitf938bc563b4ca04013d02961dd423be10eee418a (patch)
tree1d42ee53afcd4441540fb8290f600c2196ed5aad /drivers
parent54cd0208c6be19d6944f40a083fe97dd56de3489 (diff)
mtd: s3c2410: Fix line over 80 characters warning
Fixes the following checkpatch warnings: WARNING: line over 80 characters Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/s3c2410.c30
1 files changed, 20 insertions, 10 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index e82c679abe48..e71f7a951bf0 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -540,7 +540,8 @@ static void s3c2412_nand_enable_hwecc(struct mtd_info *mtd, int mode)
540 unsigned long ctrl; 540 unsigned long ctrl;
541 541
542 ctrl = readl(info->regs + S3C2440_NFCONT); 542 ctrl = readl(info->regs + S3C2440_NFCONT);
543 writel(ctrl | S3C2412_NFCONT_INIT_MAIN_ECC, info->regs + S3C2440_NFCONT); 543 writel(ctrl | S3C2412_NFCONT_INIT_MAIN_ECC,
544 info->regs + S3C2440_NFCONT);
544} 545}
545 546
546static void s3c2440_nand_enable_hwecc(struct mtd_info *mtd, int mode) 547static void s3c2440_nand_enable_hwecc(struct mtd_info *mtd, int mode)
@@ -552,7 +553,8 @@ static void s3c2440_nand_enable_hwecc(struct mtd_info *mtd, int mode)
552 writel(ctrl | S3C2440_NFCONT_INITECC, info->regs + S3C2440_NFCONT); 553 writel(ctrl | S3C2440_NFCONT_INITECC, info->regs + S3C2440_NFCONT);
553} 554}
554 555
555static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code) 556static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
557 u_char *ecc_code)
556{ 558{
557 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); 559 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
558 560
@@ -566,7 +568,8 @@ static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u
566 return 0; 568 return 0;
567} 569}
568 570
569static int s3c2412_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code) 571static int s3c2412_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
572 u_char *ecc_code)
570{ 573{
571 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); 574 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
572 unsigned long ecc = readl(info->regs + S3C2412_NFMECC0); 575 unsigned long ecc = readl(info->regs + S3C2412_NFMECC0);
@@ -575,12 +578,14 @@ static int s3c2412_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u
575 ecc_code[1] = ecc >> 8; 578 ecc_code[1] = ecc >> 8;
576 ecc_code[2] = ecc >> 16; 579 ecc_code[2] = ecc >> 16;
577 580
578 pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n", ecc_code[0], ecc_code[1], ecc_code[2]); 581 pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n",
582 ecc_code[0], ecc_code[1], ecc_code[2]);
579 583
580 return 0; 584 return 0;
581} 585}
582 586
583static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code) 587static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
588 u_char *ecc_code)
584{ 589{
585 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); 590 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
586 unsigned long ecc = readl(info->regs + S3C2440_NFMECC0); 591 unsigned long ecc = readl(info->regs + S3C2440_NFMECC0);
@@ -619,13 +624,15 @@ static void s3c2440_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
619 } 624 }
620} 625}
621 626
622static void s3c2410_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len) 627static void s3c2410_nand_write_buf(struct mtd_info *mtd, const u_char *buf,
628 int len)
623{ 629{
624 struct nand_chip *this = mtd->priv; 630 struct nand_chip *this = mtd->priv;
625 writesb(this->IO_ADDR_W, buf, len); 631 writesb(this->IO_ADDR_W, buf, len);
626} 632}
627 633
628static void s3c2440_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len) 634static void s3c2440_nand_write_buf(struct mtd_info *mtd, const u_char *buf,
635 int len)
629{ 636{
630 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); 637 struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
631 638
@@ -669,7 +676,8 @@ static inline int s3c2410_nand_cpufreq_register(struct s3c2410_nand_info *info)
669 CPUFREQ_TRANSITION_NOTIFIER); 676 CPUFREQ_TRANSITION_NOTIFIER);
670} 677}
671 678
672static inline void s3c2410_nand_cpufreq_deregister(struct s3c2410_nand_info *info) 679static inline void
680s3c2410_nand_cpufreq_deregister(struct s3c2410_nand_info *info)
673{ 681{
674 cpufreq_unregister_notifier(&info->freq_transition, 682 cpufreq_unregister_notifier(&info->freq_transition,
675 CPUFREQ_TRANSITION_NOTIFIER); 683 CPUFREQ_TRANSITION_NOTIFIER);
@@ -681,7 +689,8 @@ static inline int s3c2410_nand_cpufreq_register(struct s3c2410_nand_info *info)
681 return 0; 689 return 0;
682} 690}
683 691
684static inline void s3c2410_nand_cpufreq_deregister(struct s3c2410_nand_info *info) 692static inline void
693s3c2410_nand_cpufreq_deregister(struct s3c2410_nand_info *info)
685{ 694{
686} 695}
687#endif 696#endif
@@ -1004,7 +1013,8 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
1004 nmtd = info->mtds; 1013 nmtd = info->mtds;
1005 1014
1006 for (setno = 0; setno < nr_sets; setno++, nmtd++) { 1015 for (setno = 0; setno < nr_sets; setno++, nmtd++) {
1007 pr_debug("initialising set %d (%p, info %p)\n", setno, nmtd, info); 1016 pr_debug("initialising set %d (%p, info %p)\n",
1017 setno, nmtd, info);
1008 1018
1009 s3c2410_nand_init_chip(info, nmtd, sets); 1019 s3c2410_nand_init_chip(info, nmtd, sets);
1010 1020