lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nand/denali Clean up all white spaces in code indent

Browse Source 
Hi,
I have changed the outlook mail cliet to be linux mutt client and use my
personal gmail to submit patches.
Here are 5 new patches to fix nand/denali check patch errors. The other
4 patches will be sent out after this mail.
Thanks for your review.

>From d125ad3f57bbf517131dccad6b5933edf8c2632a Mon Sep 17 00:00:00 2001
From: Chuanxiao Dong <chuanxiao.dong@intel.com>
Date: Tue, 3 Aug 2010 15:54:48 +0800
Subject: [PATCH 1/5] mtd: denali.c: clean up all whitespaces in code indent

Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Chuanxiao
2010-08-05 23:06:04 +08:00
committed by David Woodhouse
parent d2350c2ab5
commit 5bac3acfb8
1 changed files with 168 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/mtd/nand/denali.c
View File

@@ -56,7 +56,7 @@ MODULE_PARM_DESC(onfi_timing_mode, "Overrides default ONFI setting. -1 indicates
/* indicates whether or not the internal value for the flash bank is /* indicates whether or not the internal value for the flash bank is
valid or not */ valid or not */
#define CHIP_SELECT_INVALID -1 #define CHIP_SELECT_INVALID -1
#define SUPPORT_8BITECC 1 #define SUPPORT_8BITECC 1
@@ -100,23 +100,23 @@ static const struct pci_device_id denali_pci_ids[] = {
*/ */
static const uint32_t intr_status_addresses[4] = {INTR_STATUS0, static const uint32_t intr_status_addresses[4] = {INTR_STATUS0,
INTR_STATUS1, INTR_STATUS1,
INTR_STATUS2, INTR_STATUS2,
INTR_STATUS3}; INTR_STATUS3};
static const uint32_t device_reset_banks[4] = {DEVICE_RESET__BANK0, static const uint32_t device_reset_banks[4] = {DEVICE_RESET__BANK0,
DEVICE_RESET__BANK1, DEVICE_RESET__BANK1,
DEVICE_RESET__BANK2, DEVICE_RESET__BANK2,
DEVICE_RESET__BANK3}; DEVICE_RESET__BANK3};
static const uint32_t operation_timeout[4] = {INTR_STATUS0__TIME_OUT, static const uint32_t operation_timeout[4] = {INTR_STATUS0__TIME_OUT,
INTR_STATUS1__TIME_OUT, INTR_STATUS1__TIME_OUT,
INTR_STATUS2__TIME_OUT, INTR_STATUS2__TIME_OUT,
INTR_STATUS3__TIME_OUT}; INTR_STATUS3__TIME_OUT};
static const uint32_t reset_complete[4] = {INTR_STATUS0__RST_COMP, static const uint32_t reset_complete[4] = {INTR_STATUS0__RST_COMP,
INTR_STATUS1__RST_COMP, INTR_STATUS1__RST_COMP,
INTR_STATUS2__RST_COMP, INTR_STATUS2__RST_COMP,
INTR_STATUS3__RST_COMP}; INTR_STATUS3__RST_COMP};
/* specifies the debug level of the driver */ /* specifies the debug level of the driver */
static int nand_debug_level = 0; static int nand_debug_level = 0;
@@ -641,7 +641,7 @@ static void find_valid_banks(struct denali_nand_info *denali)
{ {
/* Platform limitations of the CE4100 device limit /* Platform limitations of the CE4100 device limit
* users to a single chip solution for NAND. * users to a single chip solution for NAND.
* Multichip support is not enabled. * Multichip support is not enabled.
*/ */
if (denali->total_used_banks != 1) if (denali->total_used_banks != 1)
{ {
@@ -1016,7 +1016,7 @@ static irqreturn_t denali_isr(int irq, void *dev_id)
spin_lock(&denali->irq_lock); spin_lock(&denali->irq_lock);
/* check to see if a valid NAND chip has /* check to see if a valid NAND chip has
* been selected. * been selected.
*/ */
if (is_flash_bank_valid(denali->flash_bank)) if (is_flash_bank_valid(denali->flash_bank))
{ {
@@ -1081,7 +1081,7 @@ static uint32_t wait_for_irq(struct denali_nand_info *denali, uint32_t irq_mask)
else else
{ {
/* these are not the interrupts you are looking for - /* these are not the interrupts you are looking for -
need to wait again */ * need to wait again */
spin_unlock_irq(&denali->irq_lock); spin_unlock_irq(&denali->irq_lock);
#if DEBUG_DENALI #if DEBUG_DENALI
print_irq_log(denali); print_irq_log(denali);
@@ -1096,7 +1096,7 @@ static uint32_t wait_for_irq(struct denali_nand_info *denali, uint32_t irq_mask)
{ {
/* timeout */ /* timeout */
printk(KERN_ERR "timeout occurred, status = 0x%x, mask = 0x%x\n", printk(KERN_ERR "timeout occurred, status = 0x%x, mask = 0x%x\n",
intr_status, irq_mask); intr_status, irq_mask);
intr_status = 0; intr_status = 0;
} }
@@ -1231,7 +1231,6 @@ static int read_data_from_flash_mem(struct denali_nand_info *denali, uint8_t *bu
/* we assume that len will be a multiple of 4, if not /* we assume that len will be a multiple of 4, if not
* it would be nice to know about it ASAP rather than * it would be nice to know about it ASAP rather than
* have random failures... * have random failures...
*
* This assumption is based on the fact that this * This assumption is based on the fact that this
* function is designed to be used to read flash pages, * function is designed to be used to read flash pages,
* which are typically multiples of 4... * which are typically multiples of 4...
@@ -1505,8 +1504,8 @@ static void write_page(struct mtd_info *mtd, struct nand_chip *chip,
{ {
printk(KERN_ERR "timeout on write_page (type = %d)\n", raw_xfer); printk(KERN_ERR "timeout on write_page (type = %d)\n", raw_xfer);
denali->status = denali->status =
(irq_status & INTR_STATUS0__PROGRAM_FAIL) ? NAND_STATUS_FAIL : (irq_status & INTR_STATUS0__PROGRAM_FAIL) ? NAND_STATUS_FAIL :
PASS; PASS;
} }
denali_enable_dma(denali, false); denali_enable_dma(denali, false);
@@ -1522,7 +1521,7 @@ static void denali_write_page(struct mtd_info *mtd, struct nand_chip *chip,
const uint8_t *buf) const uint8_t *buf)
{ {
/* for regular page writes, we let HW handle all the ECC /* for regular page writes, we let HW handle all the ECC
* data written to the device. */ * data written to the device. */
write_page(mtd, chip, buf, false); write_page(mtd, chip, buf, false);
} }
@@ -1550,7 +1549,7 @@ static int denali_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
read_oob_data(mtd, chip->oob_poi, page); read_oob_data(mtd, chip->oob_poi, page);
return 0; /* notify NAND core to send command to return 0; /* notify NAND core to send command to
* NAND device. */ NAND device. */
} }
static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip, static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
@@ -1722,12 +1721,12 @@ static void denali_cmdfunc(struct mtd_info *mtd, unsigned int cmd, int col,
{ {
/* write manufacturer information into nand /* write manufacturer information into nand
buffer for NAND subsystem to fetch. buffer for NAND subsystem to fetch.
*/ */
write_byte_to_buf(denali, denali->dev_info.wDeviceMaker); write_byte_to_buf(denali, denali->dev_info.wDeviceMaker);
write_byte_to_buf(denali, denali->dev_info.wDeviceID); write_byte_to_buf(denali, denali->dev_info.wDeviceID);
write_byte_to_buf(denali, denali->dev_info.bDeviceParam0); write_byte_to_buf(denali, denali->dev_info.bDeviceParam0);
write_byte_to_buf(denali, denali->dev_info.bDeviceParam1); write_byte_to_buf(denali, denali->dev_info.bDeviceParam1);
write_byte_to_buf(denali, denali->dev_info.bDeviceParam2); write_byte_to_buf(denali, denali->dev_info.bDeviceParam2);
} }
else else
{ {
@@ -1977,7 +1976,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
NAND_Read_Device_ID(denali); NAND_Read_Device_ID(denali);
/* MTD supported page sizes vary by kernel. We validate our /* MTD supported page sizes vary by kernel. We validate our
kernel supports the device here. * kernel supports the device here.
*/ */
if (denali->dev_info.wPageSize > NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE) if (denali->dev_info.wPageSize > NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE)
{ {
@@ -2020,7 +2019,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
/* second stage of the NAND scan /* second stage of the NAND scan
* this stage requires information regarding ECC and * this stage requires information regarding ECC and
* bad block management. */ * bad block management. */
/* Bad block management */ /* Bad block management */
denali->nand.bbt_td = &bbt_main_descr; denali->nand.bbt_td = &bbt_main_descr;
@@ -2042,8 +2041,8 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
} }
/* These functions are required by the NAND core framework, otherwise, /* These functions are required by the NAND core framework, otherwise,
the NAND core will assert. However, we don't need them, so we'll stub * the NAND core will assert. However, we don't need them, so we'll stub
them out. */ * them out. */
denali->nand.ecc.calculate = denali_ecc_calculate; denali->nand.ecc.calculate = denali_ecc_calculate;
denali->nand.ecc.correct = denali_ecc_correct; denali->nand.ecc.correct = denali_ecc_correct;
denali->nand.ecc.hwctl = denali_ecc_hwctl; denali->nand.ecc.hwctl = denali_ecc_hwctl;