Patchwork ATA: sata_mv: Fix warnings when no PCI

login
register
mail settings
Submitter Andrew Lunn
Date Sept. 28, 2012, 3:04 p.m.
Message ID <1348844650-2957-1-git-send-email-andrew@lunn.ch>
Download mbox | patch
Permalink /patch/187796/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Andrew Lunn - Sept. 28, 2012, 3:04 p.m.
Dove can be configured with PCI. We then get a number of warnings:

warning: 'msi' defined but not used
warning: 'mv5_sht' defined but not used
warning: 'mv_dump_pci_cfg' defined but not used.

Move around variables and add #ifdef as necassary to fix the warnings.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/ata/sata_mv.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
Olof Johansson - Sept. 29, 2012, 9:19 p.m.
On Fri, Sep 28, 2012 at 05:04:10PM +0200, Andrew Lunn wrote:
> Dove can be configured with PCI. We then get a number of warnings:
> 
> warning: 'msi' defined but not used
> warning: 'mv5_sht' defined but not used
> warning: 'mv_dump_pci_cfg' defined but not used.
> 
> Move around variables and add #ifdef as necassary to fix the warnings.

Hi,

This should probably go through the libata maintainer, or at least be cc:d him
so you can get an ack on it (in case there are other dependencies on ARM
changes for it).  

-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jason - Sept. 30, 2012, 2:23 a.m.
Jeff,

Would you like to take this through your tree?  If not, I'll take it
through my kirkwood tree with your Ack.  Either is fine with me.

thx,

Jason.

On Fri, Sep 28, 2012 at 05:04:10PM +0200, Andrew Lunn wrote:
> Dove can be configured with PCI. We then get a number of warnings:
> 
> warning: 'msi' defined but not used
> warning: 'mv5_sht' defined but not used
> warning: 'mv_dump_pci_cfg' defined but not used.
> 
> Move around variables and add #ifdef as necassary to fix the warnings.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  drivers/ata/sata_mv.c |    8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index 311be18..68f4fb5 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -79,8 +79,8 @@
>   * module options
>   */
>  
> -static int msi;
>  #ifdef CONFIG_PCI
> +static int msi;
>  module_param(msi, int, S_IRUGO);
>  MODULE_PARM_DESC(msi, "Enable use of PCI MSI (0=off, 1=on)");
>  #endif
> @@ -652,12 +652,13 @@ static u8 mv_sff_check_status(struct ata_port *ap);
>   * because we have to allow room for worst case splitting of
>   * PRDs for 64K boundaries in mv_fill_sg().
>   */
> +#ifdef CONFIG_PCI
>  static struct scsi_host_template mv5_sht = {
>  	ATA_BASE_SHT(DRV_NAME),
>  	.sg_tablesize		= MV_MAX_SG_CT / 2,
>  	.dma_boundary		= MV_DMA_BOUNDARY,
>  };
> -
> +#endif
>  static struct scsi_host_template mv6_sht = {
>  	ATA_NCQ_SHT(DRV_NAME),
>  	.can_queue		= MV_MAX_Q_DEPTH - 1,
> @@ -1252,7 +1253,7 @@ static void mv_dump_mem(void __iomem *start, unsigned bytes)
>  	}
>  }
>  #endif
> -
> +#if defined(ATA_DEBUG) || defined(CONFIG_PCI)
>  static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes)
>  {
>  #ifdef ATA_DEBUG
> @@ -1269,6 +1270,7 @@ static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes)
>  	}
>  #endif
>  }
> +#endif
>  static void mv_dump_all_regs(void __iomem *mmio_base, int port,
>  			     struct pci_dev *pdev)
>  {
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 311be18..68f4fb5 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -79,8 +79,8 @@ 
  * module options
  */
 
-static int msi;
 #ifdef CONFIG_PCI
+static int msi;
 module_param(msi, int, S_IRUGO);
 MODULE_PARM_DESC(msi, "Enable use of PCI MSI (0=off, 1=on)");
 #endif
@@ -652,12 +652,13 @@  static u8 mv_sff_check_status(struct ata_port *ap);
  * because we have to allow room for worst case splitting of
  * PRDs for 64K boundaries in mv_fill_sg().
  */
+#ifdef CONFIG_PCI
 static struct scsi_host_template mv5_sht = {
 	ATA_BASE_SHT(DRV_NAME),
 	.sg_tablesize		= MV_MAX_SG_CT / 2,
 	.dma_boundary		= MV_DMA_BOUNDARY,
 };
-
+#endif
 static struct scsi_host_template mv6_sht = {
 	ATA_NCQ_SHT(DRV_NAME),
 	.can_queue		= MV_MAX_Q_DEPTH - 1,
@@ -1252,7 +1253,7 @@  static void mv_dump_mem(void __iomem *start, unsigned bytes)
 	}
 }
 #endif
-
+#if defined(ATA_DEBUG) || defined(CONFIG_PCI)
 static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes)
 {
 #ifdef ATA_DEBUG
@@ -1269,6 +1270,7 @@  static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes)
 	}
 #endif
 }
+#endif
 static void mv_dump_all_regs(void __iomem *mmio_base, int port,
 			     struct pci_dev *pdev)
 {