Merge tag 'hwlock-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux-2.6-microblaze.git] / drivers / ata / sata_mv.c

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 664ef65..c8867c1 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1146,9 +1146,8 @@ static void mv_set_irq_coalescing(struct ata_host *host,
        spin_unlock_irqrestore(&host->lock, flags);
 }
 
-/**
+/*
  *      mv_start_edma - Enable eDMA engine
- *      @base: port base address
  *      @pp: port private data
  *
  *      Verify the local cache of the eDMA state is accurate with a
@@ -1519,7 +1518,7 @@ static void mv_60x1_errata_sata25(struct ata_port *ap, int want_ncq)
                writel(new, hpriv->base + GPIO_PORT_CTL);
 }
 
-/**
+/*
  *     mv_bmdma_enable - set a magic bit on GEN_IIE to allow bmdma
  *     @ap: Port being initialized
  *
@@ -1918,8 +1917,8 @@ static void mv_bmdma_start(struct ata_queued_cmd *qc)
 }
 
 /**
- *     mv_bmdma_stop - Stop BMDMA transfer
- *     @qc: queued command to stop DMA on.
+ *     mv_bmdma_stop_ap - Stop BMDMA transfer
+ *     @ap: port to stop
  *
  *     Clears the ATA_DMA_START flag in the bmdma control register
  *
@@ -2221,6 +2220,7 @@ static u8 mv_sff_check_status(struct ata_port *ap)
 
 /**
  *     mv_send_fis - Send a FIS, using the "Vendor-Unique FIS" register
+ *     @ap: ATA port to send a FIS
  *     @fis: fis to be sent
  *     @nwords: number of 32-bit words in the fis
  */
@@ -3249,7 +3249,7 @@ static void mv6_reset_flash(struct mv_host_priv *hpriv, void __iomem *mmio)
        writel(tmp, mmio + GPIO_PORT_CTL);
 }
 
-/**
+/*
  *      mv6_reset_hc - Perform the 6xxx global soft reset
  *      @mmio: base address of the HBA
  *
@@ -3530,7 +3530,7 @@ static void mv_soc_65n_phy_errata(struct mv_host_priv *hpriv,
        writel(reg, port_mmio + PHY_MODE9_GEN1);
 }
 
-/**
+/*
  *     soc_is_65 - check if the soc is 65 nano device
  *
  *     Detect the type of the SoC, this is done by reading the PHYCFG_OFS
@@ -4097,6 +4097,10 @@ static int mv_platform_probe(struct platform_device *pdev)
                n_ports = mv_platform_data->n_ports;
                irq = platform_get_irq(pdev, 0);
        }
+       if (irq < 0)
+               return irq;
+       if (!irq)
+               return -EINVAL;
 
        host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
        hpriv = devm_kzalloc(&pdev->dev, sizeof(*hpriv), GFP_KERNEL);