[PATCH 1/2] drivers: ata: Mark the function ahci_init_interrupts() as static in ahci.c

[PATCH 1/2] drivers: ata: Mark the function ahci_init_interrupts() as static in ahci.c

[Rashika Kheria]

This patch marks the function ahci_init_interrupts() as static in ahci.c
because it is not used outside this file.

Thus, it also eliminates the following warning in ahci.c:
drivers/ata/ahci.c:1099:5: warning: no previous prototype for ‘ahci_init_interrupts’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
---
 drivers/ata/ahci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 14f1e95..4ab1d41 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1097,7 +1097,7 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host)
 {}
 #endif
 
-int ahci_init_interrupts(struct pci_dev *pdev, struct ahci_host_priv *hpriv)
+static int ahci_init_interrupts(struct pci_dev *pdev, struct ahci_host_priv *hpriv)
 {
 	int rc;
 	unsigned int maxvec;
-- 
1.7.9.5

[PATCH 2/2] drivers: ata: Mark the function as static in libahci.c

[Rashika Kheria]

This patch marks the function ahci_port_intr() and
ahci_hw_port_interrupt() as static in libahci.c because they are not
used outside this file.

Thus, it also eliminates the following warnings in libahci.c:
drivers/ata/libahci.c:1767:6: warning: no previous prototype for ‘ahci_port_intr’ [-Wmissing-prototypes]
drivers/ata/libahci.c:1800:6: warning: no previous prototype for ‘ahci_hw_port_interrupt’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
---
 drivers/ata/libahci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index c482f8c..36605ab 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1764,7 +1764,7 @@ static void ahci_handle_port_interrupt(struct ata_port *ap,
 	}
 }
 
-void ahci_port_intr(struct ata_port *ap)
+static void ahci_port_intr(struct ata_port *ap)
 {
 	void __iomem *port_mmio = ahci_port_base(ap);
 	u32 status;
@@ -1797,7 +1797,7 @@ irqreturn_t ahci_thread_fn(int irq, void *dev_instance)
 }
 EXPORT_SYMBOL_GPL(ahci_thread_fn);
 
-void ahci_hw_port_interrupt(struct ata_port *ap)
+static void ahci_hw_port_interrupt(struct ata_port *ap)
 {
 	void __iomem *port_mmio = ahci_port_base(ap);
 	struct ahci_port_priv *pp = ap->private_data;
-- 
1.7.9.5

Re: [PATCH 1/2] drivers: ata: Mark the function ahci_init_interrupts() as static in ahci.c

[Josh Triplett]

On Sat, Dec 14, 2013 at 07:38:08PM +0530, Rashika Kheria wrote:
> This patch marks the function ahci_init_interrupts() as static in ahci.c
> because it is not used outside this file.
> 
> Thus, it also eliminates the following warning in ahci.c:
> drivers/ata/ahci.c:1099:5: warning: no previous prototype for ‘ahci_init_interrupts’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  drivers/ata/ahci.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 14f1e95..4ab1d41 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -1097,7 +1097,7 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host)
>  {}
>  #endif
>  
> -int ahci_init_interrupts(struct pci_dev *pdev, struct ahci_host_priv *hpriv)
> +static int ahci_init_interrupts(struct pci_dev *pdev, struct ahci_host_priv *hpriv)
>  {
>  	int rc;
>  	unsigned int maxvec;
> -- 
> 1.7.9.5
> 

Re: [PATCH 2/2] drivers: ata: Mark the function as static in libahci.c

[Josh Triplett]

On Sat, Dec 14, 2013 at 07:40:21PM +0530, Rashika Kheria wrote:
> This patch marks the function ahci_port_intr() and
> ahci_hw_port_interrupt() as static in libahci.c because they are not
> used outside this file.
> 
> Thus, it also eliminates the following warnings in libahci.c:
> drivers/ata/libahci.c:1767:6: warning: no previous prototype for ‘ahci_port_intr’ [-Wmissing-prototypes]
> drivers/ata/libahci.c:1800:6: warning: no previous prototype for ‘ahci_hw_port_interrupt’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  drivers/ata/libahci.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
> index c482f8c..36605ab 100644
> --- a/drivers/ata/libahci.c
> +++ b/drivers/ata/libahci.c
> @@ -1764,7 +1764,7 @@ static void ahci_handle_port_interrupt(struct ata_port *ap,
>  	}
>  }
>  
> -void ahci_port_intr(struct ata_port *ap)
> +static void ahci_port_intr(struct ata_port *ap)
>  {
>  	void __iomem *port_mmio = ahci_port_base(ap);
>  	u32 status;
> @@ -1797,7 +1797,7 @@ irqreturn_t ahci_thread_fn(int irq, void *dev_instance)
>  }
>  EXPORT_SYMBOL_GPL(ahci_thread_fn);
>  
> -void ahci_hw_port_interrupt(struct ata_port *ap)
> +static void ahci_hw_port_interrupt(struct ata_port *ap)
>  {
>  	void __iomem *port_mmio = ahci_port_base(ap);
>  	struct ahci_port_priv *pp = ap->private_data;
> -- 
> 1.7.9.5
> 

Re: [PATCH 2/2] drivers: ata: Mark the function as static in libahci.c

[Tejun Heo]

On Sat, Dec 14, 2013 at 07:40:21PM +0530, Rashika Kheria wrote:
> This patch marks the function ahci_port_intr() and
> ahci_hw_port_interrupt() as static in libahci.c because they are not
> used outside this file.
> 
> Thus, it also eliminates the following warnings in libahci.c:
> drivers/ata/libahci.c:1767:6: warning: no previous prototype for ‘ahci_port_intr’ [-Wmissing-prototypes]
> drivers/ata/libahci.c:1800:6: warning: no previous prototype for ‘ahci_hw_port_interrupt’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

Applied 1-2 to libata/for-3.14.

Thanks.

-- 
tejun