OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sgiioc4: coding style cleanup 

Fix several errors and warnings given by checkpatch.pl:

- space between the asterisk and parameter name;

- inconsistent spacing between operator and operands;

- space between *sizeof* and open parenthesis;

- #include <asm/io.h> instead of #include <linux/io.h>

- use of *typedef* instead of a structure tag;

- line over 80 characters.

In addition to these changes, also do the following:

- indent with tabs instead of spaces;

- put the function's result type and name/parameters on the same line;

- join back the needlessly broken lines;

- get rid of needless type cast in sgiioc4_checkirq();

- remove space between the type cast and the variable name;

- remove commented out field initializer;

- uppercase the acronyms, lowercase the normal words in the comments;

- fix up the multi-line comment style...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Sergei Shtylyov 2009-06-15 18:52:55 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 5880b5de71
commit ccae50bcf9
1 changed files with 54 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
drivers/ide/sgiioc4.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2003-2006 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2003-2006 Silicon Graphics, Inc. All Rights Reserved.
* Copyright (C) 2008 MontaVista Software, Inc. * Copyright (C) 2008-2009 MontaVista Software, Inc.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License * under the terms of version 2 of the GNU General Public License
@ -29,8 +29,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/ioc4.h> #include <linux/ioc4.h>
#include <asm/io.h> #include <linux/io.h>
#include <linux/ide.h> #include <linux/ide.h>
#define DRV_NAME "SGIIOC4" #define DRV_NAME "SGIIOC4"
@ -72,7 +71,7 @@
#define IOC4_CMD_CTL_BLK_SIZE 0x20 #define IOC4_CMD_CTL_BLK_SIZE 0x20
#define IOC4_SUPPORTED_FIRMWARE_REV 46 #define IOC4_SUPPORTED_FIRMWARE_REV 46
typedef struct { struct ioc4_dma_regs {
u32 timing_reg0; u32 timing_reg0;
u32 timing_reg1; u32 timing_reg1;
u32 low_mem_ptr; u32 low_mem_ptr;
@ -82,17 +81,18 @@ typedef struct {
u32 dev_byte_count; u32 dev_byte_count;
u32 mem_byte_count; u32 mem_byte_count;
u32 status; u32 status;
} ioc4_dma_regs_t; };
/* Each Physical Region Descriptor Entry size is 16 bytes (2 * 64 bits) */ /* Each Physical Region Descriptor Entry size is 16 bytes (2 * 64 bits) */
/* IOC4 has only 1 IDE channel */ /* IOC4 has only 1 IDE channel */
#define IOC4_PRD_BYTES 16 #define IOC4_PRD_BYTES 16
#define IOC4_PRD_ENTRIES (PAGE_SIZE /(4*IOC4_PRD_BYTES)) #define IOC4_PRD_ENTRIES (PAGE_SIZE / (4 * IOC4_PRD_BYTES))
static void static void sgiioc4_init_hwif_ports(struct ide_hw *hw,
sgiioc4_init_hwif_ports(struct ide_hw *hw, unsigned long data_port, unsigned long data_port,
unsigned long ctrl_port, unsigned long irq_port) unsigned long ctrl_port,
unsigned long irq_port)
{ {
unsigned long reg = data_port; unsigned long reg = data_port;
int i; int i;
@ -105,13 +105,11 @@ sgiioc4_init_hwif_ports(struct ide_hw *hw, unsigned long data_port,
hw->io_ports.irq_addr = irq_port; hw->io_ports.irq_addr = irq_port;
} }
static int static int sgiioc4_checkirq(ide_hwif_t *hwif)
sgiioc4_checkirq(ide_hwif_t * hwif)
{ {
unsigned long intr_addr = unsigned long intr_addr = hwif->io_ports.irq_addr + IOC4_INTR_REG * 4;
hwif->io_ports.irq_addr + IOC4_INTR_REG * 4;
if ((u8)readl((void __iomem *)intr_addr) & 0x03) if (readl((void __iomem *)intr_addr) & 0x03)
return 1; return 1;
return 0; return 0;
@ -119,8 +117,7 @@ sgiioc4_checkirq(ide_hwif_t * hwif)
static u8 sgiioc4_read_status(ide_hwif_t *); static u8 sgiioc4_read_status(ide_hwif_t *);
static int static int sgiioc4_clearirq(ide_drive_t *drive)
sgiioc4_clearirq(ide_drive_t * drive)
{ {
u32 intr_reg; u32 intr_reg;
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
@ -158,12 +155,10 @@ sgiioc4_clearirq(ide_drive_t * drive)
readl((void __iomem *)(io_ports->irq_addr + 4)); readl((void __iomem *)(io_ports->irq_addr + 4));
pci_read_config_dword(dev, PCI_COMMAND, pci_read_config_dword(dev, PCI_COMMAND,
&pci_stat_cmd_reg); &pci_stat_cmd_reg);
printk(KERN_ERR printk(KERN_ERR "%s(%s): PCI Bus Error when doing DMA: "
"%s(%s) : PCI Bus Error when doing DMA:" "status-cmd reg is 0x%x\n",
" status-cmd reg is 0x%x\n",
__func__, drive->name, pci_stat_cmd_reg); __func__, drive->name, pci_stat_cmd_reg);
printk(KERN_ERR printk(KERN_ERR "%s(%s): PCI Error Address is 0x%x%x\n",
"%s(%s) : PCI Error Address is 0x%x%x\n",
__func__, drive->name, __func__, drive->name,
pci_err_addr_high, pci_err_addr_low); pci_err_addr_high, pci_err_addr_low);
/* Clear the PCI Error indicator */ /* Clear the PCI Error indicator */
@ -189,8 +184,7 @@ static void sgiioc4_dma_start(ide_drive_t *drive)
writel(temp_reg, (void __iomem *)ioc4_dma_addr); writel(temp_reg, (void __iomem *)ioc4_dma_addr);
} }
static u32 static u32 sgiioc4_ide_dma_stop(ide_hwif_t *hwif, u64 dma_base)
sgiioc4_ide_dma_stop(ide_hwif_t *hwif, u64 dma_base)
{ {
unsigned long ioc4_dma_addr = dma_base + IOC4_DMA_CTRL * 4; unsigned long ioc4_dma_addr = dma_base + IOC4_DMA_CTRL * 4;
u32 ioc4_dma; u32 ioc4_dma;
@ -227,7 +221,7 @@ static int sgiioc4_dma_end(ide_drive_t *drive)
} }
/* /*
* The IOC4 will DMA 1's to the ending dma area to indicate that * The IOC4 will DMA 1's to the ending DMA area to indicate that
* previous data DMA is complete. This is necessary because of relaxed * previous data DMA is complete. This is necessary because of relaxed
* ordering between register reads and DMA writes on the Altix. * ordering between register reads and DMA writes on the Altix.
*/ */
@ -265,7 +259,7 @@ static void sgiioc4_set_dma_mode(ide_drive_t *drive, const u8 speed)
{ {
} }
/* returns 1 if dma irq issued, 0 otherwise */ /* Returns 1 if DMA IRQ issued, 0 otherwise */
static int sgiioc4_dma_test_irq(ide_drive_t *drive) static int sgiioc4_dma_test_irq(ide_drive_t *drive)
{ {
return sgiioc4_checkirq(drive->hwif); return sgiioc4_checkirq(drive->hwif);
@ -286,8 +280,7 @@ static void sgiioc4_resetproc(ide_drive_t *drive)
sgiioc4_clearirq(drive); sgiioc4_clearirq(drive);
} }
static void static void sgiioc4_dma_lost_irq(ide_drive_t *drive)
sgiioc4_dma_lost_irq(ide_drive_t * drive)
{ {
sgiioc4_resetproc(drive); sgiioc4_resetproc(drive);
@ -313,13 +306,13 @@ static u8 sgiioc4_read_status(ide_hwif_t *hwif)
return reg; return reg;
} }
/* Creates a dma map for the scatter-gather list entries */ /* Creates a DMA map for the scatter-gather list entries */
static int __devinit static int __devinit ide_dma_sgiioc4(ide_hwif_t *hwif,
ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d) const struct ide_port_info *d)
{ {
struct pci_dev *dev = to_pci_dev(hwif->dev); struct pci_dev *dev = to_pci_dev(hwif->dev);
unsigned long dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET; unsigned long dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET;
int num_ports = sizeof (ioc4_dma_regs_t); int num_ports = sizeof(struct ioc4_dma_regs);
void *pad; void *pad;
printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name); printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name);
@ -362,8 +355,7 @@ dma_pci_alloc_failure:
} }
/* Initializes the IOC4 DMA Engine */ /* Initializes the IOC4 DMA Engine */
static void static void sgiioc4_configure_for_dma(int dma_direction, ide_drive_t *drive)
sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
{ {
u32 ioc4_dma; u32 ioc4_dma;
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
@ -374,31 +366,27 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
ioc4_dma = readl((void __iomem *)ioc4_dma_addr); ioc4_dma = readl((void __iomem *)ioc4_dma_addr);
if (ioc4_dma & IOC4_S_DMA_ACTIVE) { if (ioc4_dma & IOC4_S_DMA_ACTIVE) {
printk(KERN_WARNING printk(KERN_WARNING "%s(%s): Warning!! DMA from previous "
"%s(%s):Warning!! DMA from previous transfer was still active\n", "transfer was still active\n", __func__, drive->name);
__func__, drive->name);
writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr); writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr);
ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base); ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base);
if (ioc4_dma & IOC4_S_DMA_STOP) if (ioc4_dma & IOC4_S_DMA_STOP)
printk(KERN_ERR printk(KERN_ERR "%s(%s): IOC4 DMA STOP bit is "
"%s(%s) : IOC4 Dma STOP bit is still 1\n", "still 1\n", __func__, drive->name);
__func__, drive->name);
} }
ioc4_dma = readl((void __iomem *)ioc4_dma_addr); ioc4_dma = readl((void __iomem *)ioc4_dma_addr);
if (ioc4_dma & IOC4_S_DMA_ERROR) { if (ioc4_dma & IOC4_S_DMA_ERROR) {
printk(KERN_WARNING printk(KERN_WARNING "%s(%s): Warning!! DMA Error during "
"%s(%s) : Warning!! - DMA Error during Previous" "previous transfer, status 0x%x\n",
" transfer | status 0x%x\n",
__func__, drive->name, ioc4_dma); __func__, drive->name, ioc4_dma);
writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr); writel(IOC4_S_DMA_STOP, (void __iomem *)ioc4_dma_addr);
ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base); ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base);
if (ioc4_dma & IOC4_S_DMA_STOP) if (ioc4_dma & IOC4_S_DMA_STOP)
printk(KERN_ERR printk(KERN_ERR "%s(%s): IOC4 DMA STOP bit is "
"%s(%s) : IOC4 DMA STOP bit is still 1\n", "still 1\n", __func__, drive->name);
__func__, drive->name);
} }
/* Address of the Scatter Gather List */ /* Address of the Scatter Gather List */
@ -408,20 +396,22 @@ sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
/* Address of the Ending DMA */ /* Address of the Ending DMA */
memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE); memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE);
ending_dma_addr = cpu_to_le32(hwif->extra_base); ending_dma_addr = cpu_to_le32(hwif->extra_base);
writel(ending_dma_addr, (void __iomem *)(dma_base + IOC4_DMA_END_ADDR * 4)); writel(ending_dma_addr, (void __iomem *)(dma_base +
IOC4_DMA_END_ADDR * 4));
writel(dma_direction, (void __iomem *)ioc4_dma_addr); writel(dma_direction, (void __iomem *)ioc4_dma_addr);
} }
/* IOC4 Scatter Gather list Format */ /* IOC4 Scatter Gather list Format */
/* 128 Bit entries to support 64 bit addresses in the future */ /* 128 Bit entries to support 64 bit addresses in the future */
/* The Scatter Gather list Entry should be in the BIG-ENDIAN Format */ /* The Scatter Gather list Entry should be in the BIG-ENDIAN Format */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* | Upper 32 bits - Zero | Lower 32 bits- address | */ /* | Upper 32 bits - Zero | Lower 32 bits- address | */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* | Upper 32 bits - Zero |EOL| 15 unused | 16 Bit Length| */ /* | Upper 32 bits - Zero |EOL| 15 unused | 16 Bit Length| */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* Creates the scatter gather list, DMA Table */ /* Creates the scatter gather list, DMA Table */
static int sgiioc4_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) static int sgiioc4_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
@ -448,8 +438,10 @@ static int sgiioc4_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
if (bcount > cur_len) if (bcount > cur_len)
bcount = cur_len; bcount = cur_len;
/* put the addr, length in /*
* the IOC4 dma-table format */ * Put the address, length in
* the IOC4 dma-table format
*/
*table = 0x0; *table = 0x0;
table++; table++;
*table = cpu_to_be32(cur_addr); *table = cpu_to_be32(cur_addr);
@ -540,8 +532,7 @@ static const struct ide_port_info sgiioc4_port_info __devinitconst = {
.mwdma_mask = ATA_MWDMA2_ONLY, .mwdma_mask = ATA_MWDMA2_ONLY,
}; };
static int __devinit static int __devinit sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
{ {
unsigned long cmd_base, irqport; unsigned long cmd_base, irqport;
unsigned long bar0, cmd_phys_base, ctl; unsigned long bar0, cmd_phys_base, ctl;
@ -549,7 +540,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
struct ide_hw hw, *hws[] = { &hw }; struct ide_hw hw, *hws[] = { &hw };
int rc; int rc;
/* Get the CmdBlk and CtrlBlk Base Registers */ /* Get the CmdBlk and CtrlBlk base registers */
bar0 = pci_resource_start(dev, 0); bar0 = pci_resource_start(dev, 0);
virt_base = pci_ioremap_bar(dev, 0); virt_base = pci_ioremap_bar(dev, 0);
if (virt_base == NULL) { if (virt_base == NULL) {
@ -557,9 +548,9 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
DRV_NAME, bar0); DRV_NAME, bar0);
return -ENOMEM; return -ENOMEM;
} }
cmd_base = (unsigned long) virt_base + IOC4_CMD_OFFSET; cmd_base = (unsigned long)virt_base + IOC4_CMD_OFFSET;
ctl = (unsigned long) virt_base + IOC4_CTRL_OFFSET; ctl = (unsigned long)virt_base + IOC4_CTRL_OFFSET;
irqport = (unsigned long) virt_base + IOC4_INTR_OFFSET; irqport = (unsigned long)virt_base + IOC4_INTR_OFFSET;
cmd_phys_base = bar0 + IOC4_CMD_OFFSET; cmd_phys_base = bar0 + IOC4_CMD_OFFSET;
if (request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE, if (request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,
@ -577,7 +568,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
hw.irq = dev->irq; hw.irq = dev->irq;
hw.dev = &dev->dev; hw.dev = &dev->dev;
/* Initializing chipset IRQ Registers */ /* Initialize chipset IRQ registers */
writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4)); writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));
rc = ide_host_add(&sgiioc4_port_info, hws, 1, NULL); rc = ide_host_add(&sgiioc4_port_info, hws, 1, NULL);
@ -590,8 +581,7 @@ req_mem_rgn_err:
return rc; return rc;
} }
static unsigned int __devinit static unsigned int __devinit pci_init_sgiioc4(struct pci_dev *dev)
pci_init_sgiioc4(struct pci_dev *dev)
{ {
int ret; int ret;
@ -611,10 +601,10 @@ out:
return ret; return ret;
} }
int __devinit int __devinit ioc4_ide_attach_one(struct ioc4_driver_data *idd)
ioc4_ide_attach_one(struct ioc4_driver_data *idd)
{ {
/* PCI-RT does not bring out IDE connection. /*
* PCI-RT does not bring out IDE connection.
* Do not attach to this particular IOC4. * Do not attach to this particular IOC4.
*/ */
if (idd->idd_variant == IOC4_VARIANT_PCI_RT) if (idd->idd_variant == IOC4_VARIANT_PCI_RT)
@ -627,7 +617,6 @@ static struct ioc4_submodule __devinitdata ioc4_ide_submodule = {
.is_name = "IOC4_ide", .is_name = "IOC4_ide",
.is_owner = THIS_MODULE, .is_owner = THIS_MODULE,
.is_probe = ioc4_ide_attach_one, .is_probe = ioc4_ide_attach_one,
/* .is_remove = ioc4_ide_remove_one, */
}; };
static int __init ioc4_ide_init(void) static int __init ioc4_ide_init(void)