asus_acpi: convert to seq_file

[safe/jmp/linux-2.6] / drivers / ata / pata_octeon_cf.c

diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index efe2c19..d6f6956 100644 (file)
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -213,7 +213,7 @@ static void octeon_cf_set_dmamode(struct ata_port *ap, struct ata_device *dev)
         * This is tI, C.F. spec. says 0, but Sony CF card requires
         * more, we use 20 nS.
         */
-       dma_tim.s.dmack_s = ns_to_tim_reg(tim_mult, 20);;
+       dma_tim.s.dmack_s = ns_to_tim_reg(tim_mult, 20);
        dma_tim.s.dmack_h = ns_to_tim_reg(tim_mult, dma_ackh);
 
        dma_tim.s.dmarq = dma_arq;
@@ -503,7 +503,7 @@ static void octeon_cf_dma_setup(struct ata_queued_cmd *qc)
        struct ata_port *ap = qc->ap;
        struct octeon_cf_port *cf_port;
 
-       cf_port = (struct octeon_cf_port *)ap->private_data;
+       cf_port = ap->private_data;
        DPRINTK("ENTER\n");
        /* issue r/w command */
        qc->cursg = qc->sg;
@@ -596,7 +596,7 @@ static unsigned int octeon_cf_dma_finished(struct ata_port *ap,
        if (ap->hsm_task_state != HSM_ST_LAST)
                return 0;
 
-       cf_port = (struct octeon_cf_port *)ap->private_data;
+       cf_port = ap->private_data;
 
        dma_cfg.u64 = cvmx_read_csr(CVMX_MIO_BOOT_DMA_CFGX(ocd->dma_engine));
        if (dma_cfg.s.size != 0xfffff) {
@@ -653,11 +653,12 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance)
 
                ap = host->ports[i];
                ocd = ap->dev->platform_data;
-               if (!ap || (ap->flags & ATA_FLAG_DISABLED))
+
+               if (ap->flags & ATA_FLAG_DISABLED)
                        continue;
 
                ocd = ap->dev->platform_data;
-               cf_port = (struct octeon_cf_port *)ap->private_data;
+               cf_port = ap->private_data;
                dma_int.u64 =
                        cvmx_read_csr(CVMX_MIO_BOOT_DMA_INTX(ocd->dma_engine));
                dma_cfg.u64 =
@@ -840,7 +841,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
        ocd = pdev->dev.platform_data;
 
        cs0 = devm_ioremap_nocache(&pdev->dev, res_cs0->start,
-                                  res_cs0->end - res_cs0->start + 1);
+                                  resource_size(res_cs0));
 
        if (!cs0)
                return -ENOMEM;