[PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[Rashika Kheria]

This patch removes the function igb_get_eee_status_i354() in
e1000_82575.c because it is unused.

It thus eliminates the following warning in
ethernet/intel/igb/e1000_82575.c:
drivers/net/ethernet/intel/igb/e1000_82575.c:2591:5: warning: no previous prototype for ‘igb_get_eee_status_i354’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/ethernet/intel/igb/e1000_82575.c |   32 --------------------------
 1 file changed, 32 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index 47c2d10..18e5200 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -2580,38 +2580,6 @@ out:
 	return ret_val;
 }
 
-/**
- *  igb_get_eee_status_i354 - Get EEE status
- *  @hw: pointer to the HW structure
- *  @status: EEE status
- *
- *  Get EEE status by guessing based on whether Tx or Rx LPI indications have
- *  been received.
- **/
-s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status)
-{
-	struct e1000_phy_info *phy = &hw->phy;
-	s32 ret_val = 0;
-	u16 phy_data;
-
-	/* Check if EEE is supported on this device. */
-	if ((hw->phy.media_type != e1000_media_type_copper) ||
-	    (phy->id != M88E1543_E_PHY_ID))
-		goto out;
-
-	ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
-				     E1000_PCS_STATUS_DEV_I354,
-				     &phy_data);
-	if (ret_val)
-		goto out;
-
-	*status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
-			      E1000_PCS_STATUS_RX_LPI_RCVD) ? true : false;
-
-out:
-	return ret_val;
-}
-
 static const u8 e1000_emc_temp_data[4] = {
 	E1000_EMC_INTERNAL_DATA,
 	E1000_EMC_DIODE1_DATA,
-- 
1.7.9.5


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

[PATCH v2 2/9] drivers: net: Mark functions as static in qlcnic_io.c

[Rashika Kheria]

This patch marks the function qlcnic_enable_tx_intr(),
qlcnic_83xx_enable_tx_intr() and qlcnic_83xx_disable_tx_intr() in
qlcnic_io.c as static because they are not used outside this file.

Thus, it also removes the following warnings in
ethernet/qlogic/qlcnic/qlcnic_io.c:

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:130:13: warning: no previous prototype for ‘qlcnic_enable_tx_intr’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:147:13: warning: no previous prototype for ‘qlcnic_83xx_enable_tx_intr’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:153:13: warning: no previous prototype for ‘qlcnic_83xx_disable_tx_intr’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 0149c94..ac7ffc5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -127,7 +127,7 @@
 struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *,
 				     struct qlcnic_host_rds_ring *, u16, u16);
 
-inline void qlcnic_enable_tx_intr(struct qlcnic_adapter *adapter,
+static inline void qlcnic_enable_tx_intr(struct qlcnic_adapter *adapter,
 				  struct qlcnic_host_tx_ring *tx_ring)
 {
 	if (qlcnic_check_multi_tx(adapter) &&
@@ -144,13 +144,13 @@ static inline void qlcnic_disable_tx_int(struct qlcnic_adapter *adapter,
 		writel(1, tx_ring->crb_intr_mask);
 }
 
-inline void qlcnic_83xx_enable_tx_intr(struct qlcnic_adapter *adapter,
+static inline void qlcnic_83xx_enable_tx_intr(struct qlcnic_adapter *adapter,
 				       struct qlcnic_host_tx_ring *tx_ring)
 {
 	writel(0, tx_ring->crb_intr_mask);
 }
 
-inline void qlcnic_83xx_disable_tx_intr(struct qlcnic_adapter *adapter,
+static inline void qlcnic_83xx_disable_tx_intr(struct qlcnic_adapter *adapter,
 					struct qlcnic_host_tx_ring *tx_ring)
 {
 	writel(1, tx_ring->crb_intr_mask);
-- 
1.7.9.5

[PATCH v3 1/8] drivers: net: Mark functions as static in qlcnic_io.c

[Rashika Kheria]

This patch marks the function qlcnic_enable_tx_intr(),
qlcnic_83xx_enable_tx_intr() and qlcnic_83xx_disable_tx_intr() in
qlcnic_io.c as static because they are not used outside this file.

Thus, it also removes the following warnings in
ethernet/qlogic/qlcnic/qlcnic_io.c:

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:130:13: warning: no previous prototype for ‘qlcnic_enable_tx_intr’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:147:13: warning: no previous prototype for ‘qlcnic_83xx_enable_tx_intr’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:153:13: warning: no previous prototype for ‘qlcnic_83xx_disable_tx_intr’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 0149c94..ac7ffc5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -127,7 +127,7 @@
 struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *,
 				     struct qlcnic_host_rds_ring *, u16, u16);
 
-inline void qlcnic_enable_tx_intr(struct qlcnic_adapter *adapter,
+static inline void qlcnic_enable_tx_intr(struct qlcnic_adapter *adapter,
 				  struct qlcnic_host_tx_ring *tx_ring)
 {
 	if (qlcnic_check_multi_tx(adapter) &&
@@ -144,13 +144,13 @@ static inline void qlcnic_disable_tx_int(struct qlcnic_adapter *adapter,
 		writel(1, tx_ring->crb_intr_mask);
 }
 
-inline void qlcnic_83xx_enable_tx_intr(struct qlcnic_adapter *adapter,
+static inline void qlcnic_83xx_enable_tx_intr(struct qlcnic_adapter *adapter,
 				       struct qlcnic_host_tx_ring *tx_ring)
 {
 	writel(0, tx_ring->crb_intr_mask);
 }
 
-inline void qlcnic_83xx_disable_tx_intr(struct qlcnic_adapter *adapter,
+static inline void qlcnic_83xx_disable_tx_intr(struct qlcnic_adapter *adapter,
 					struct qlcnic_host_tx_ring *tx_ring)
 {
 	writel(1, tx_ring->crb_intr_mask);
-- 
1.7.9.5

[PATCH v3 2/8] drivers: net: Mark functions as static in qlcnic_83xx_hw.c

[Rashika Kheria]

This patch marks the function qlcnic_83xx_clear_legacy_intr_mask(),
qlcnic_83xx_set_legacy_intr_mask() and
qlcnic_83xx_enable_legacy_msix_mbx_intr() in qlcnic_83xx_hw.c as static
because they are not used outside this file.

Thus, it also removes the following warnings
in ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:318:13: warning: no previous prototype for ‘qlcnic_83xx_clear_legacy_intr_mask’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:323:13: warning: no previous prototype for ‘qlcnic_83xx_set_legacy_intr_mask’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:343:13: warning: no previous prototype for ‘qlcnic_83xx_enable_legacy_msix_mbx_intr’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index b1cb0ff..d0c2cd4 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -315,12 +315,12 @@ int qlcnic_83xx_setup_intr(struct qlcnic_adapter *adapter)
 	return 0;
 }
 
-inline void qlcnic_83xx_clear_legacy_intr_mask(struct qlcnic_adapter *adapter)
+static inline void qlcnic_83xx_clear_legacy_intr_mask(struct qlcnic_adapter *adapter)
 {
 	writel(0, adapter->tgt_mask_reg);
 }
 
-inline void qlcnic_83xx_set_legacy_intr_mask(struct qlcnic_adapter *adapter)
+static inline void qlcnic_83xx_set_legacy_intr_mask(struct qlcnic_adapter *adapter)
 {
 	if (adapter->tgt_mask_reg)
 		writel(1, adapter->tgt_mask_reg);
@@ -340,7 +340,7 @@ void qlcnic_83xx_disable_intr(struct qlcnic_adapter *adapter,
 	writel(1, sds_ring->crb_intr_mask);
 }
 
-inline void qlcnic_83xx_enable_legacy_msix_mbx_intr(struct qlcnic_adapter
+static inline void qlcnic_83xx_enable_legacy_msix_mbx_intr(struct qlcnic_adapter
 						    *adapter)
 {
 	u32 mask;
-- 
1.7.9.5

RE: [PATCH v3 2/8] drivers: net: Mark functions as static in qlcnic_83xx_hw.c

[Shahed Shaikh]

> -----Original Message-----
> From: Rashika Kheria [mailto:rashika.kheria@gmail.com]
> Sent: Thursday, December 19, 2013 2:18 PM
> To: linux-kernel; Himanshu Madhani; Rajesh Borundia; Shahed Shaikh;
> Jitendra Kalsaria; Sony Chacko; Sucheta Chakraborty; Dept-Eng Linux Driver;
> netdev; josh@joshtriplett.org
> Subject: [PATCH v3 2/8] drivers: net: Mark functions as static in
> qlcnic_83xx_hw.c
> 
> This patch marks the function qlcnic_83xx_clear_legacy_intr_mask(),
> qlcnic_83xx_set_legacy_intr_mask() and
> qlcnic_83xx_enable_legacy_msix_mbx_intr() in qlcnic_83xx_hw.c as static
> because they are not used outside this file.
> 
> Thus, it also removes the following warnings in
> ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:
> 
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:318:13: warning: no
> previous prototype for ‘qlcnic_83xx_clear_legacy_intr_mask’ [-Wmissing-
> prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:323:13: warning: no
> previous prototype for ‘qlcnic_83xx_set_legacy_intr_mask’ [-Wmissing-
> prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:343:13: warning: no
> previous prototype for ‘qlcnic_83xx_enable_legacy_msix_mbx_intr’ [-
> Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Acked-by: Shahed Shaikh <shahed.shaikh@qlogic.com>

Thanks,
Shahed

Re: [PATCH v3 2/8] drivers: net: Mark functions as static in qlcnic_83xx_hw.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:18:11 +0530

> This patch marks the function qlcnic_83xx_clear_legacy_intr_mask(),
> qlcnic_83xx_set_legacy_intr_mask() and
> qlcnic_83xx_enable_legacy_msix_mbx_intr() in qlcnic_83xx_hw.c as static
> because they are not used outside this file.
> 
> Thus, it also removes the following warnings
> in ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:
> 
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:318:13: warning: no previous prototype for ‘qlcnic_83xx_clear_legacy_intr_mask’ [-Wmissing-prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:323:13: warning: no previous prototype for ‘qlcnic_83xx_set_legacy_intr_mask’ [-Wmissing-prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:343:13: warning: no previous prototype for ‘qlcnic_83xx_enable_legacy_msix_mbx_intr’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Applied.

[PATCH v3 3/8] drivers: net: Mark functions as static in stmmac_platform.c

[Rashika Kheria]

This patch marks the function stmmac_pltfr_freeze() and
stmmac_pltfr_restore() in stmmac_platform.c as static because they are
not used outside this file.

Thus, it also removes the following warnings in
ethernet/stmicro/stmmac/stmmac_platform.c:

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:222:5: warning: no previous prototype for ‘stmmac_pltfr_freeze’ [-Wmissing-prototypes]
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:236:5: warning: no previous prototype for ‘stmmac_pltfr_restore’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 51c9069..38bd1f4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -219,7 +219,7 @@ static int stmmac_pltfr_resume(struct device *dev)
 	return stmmac_resume(ndev);
 }
 
-int stmmac_pltfr_freeze(struct device *dev)
+static int stmmac_pltfr_freeze(struct device *dev)
 {
 	int ret;
 	struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
@@ -233,7 +233,7 @@ int stmmac_pltfr_freeze(struct device *dev)
 	return ret;
 }
 
-int stmmac_pltfr_restore(struct device *dev)
+static int stmmac_pltfr_restore(struct device *dev)
 {
 	struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
 	struct net_device *ndev = dev_get_drvdata(dev);
-- 
1.7.9.5

Re: [PATCH v3 3/8] drivers: net: Mark functions as static in stmmac_platform.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:19:44 +0530

> This patch marks the function stmmac_pltfr_freeze() and
> stmmac_pltfr_restore() in stmmac_platform.c as static because they are
> not used outside this file.
> 
> Thus, it also removes the following warnings in
> ethernet/stmicro/stmmac/stmmac_platform.c:
> 
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:222:5: warning: no previous prototype for ‘stmmac_pltfr_freeze’ [-Wmissing-prototypes]
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:236:5: warning: no previous prototype for ‘stmmac_pltfr_restore’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Applied.

[PATCH v3 4/8] drivers: net: Include new header file in sbni.c

[Rashika Kheria]

Create a new header file include/net/Space.h which contains
prototype declaration of sbni_probe().

Include the new header file in drivers/net/Space.c and
drivers/net/wan/sbni.c because they use this function.

This eliminates the following warning in wan/sbni.c:
drivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---

Changes since v2:
Incorrect fix

 drivers/net/Space.c    |   29 +----------------------------
 drivers/net/wan/sbni.c |    1 +
 include/net/Space.h    |   31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 include/net/Space.h

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index a7271e0..67977f1 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -32,39 +32,12 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/netlink.h>
+#include <net/Space.h>
 
 /* A unified ethernet device probe.  This is the easiest way to have every
    ethernet adaptor have the name "eth[0123...]".
    */
 
-extern struct net_device *hp100_probe(int unit);
-extern struct net_device *ultra_probe(int unit);
-extern struct net_device *wd_probe(int unit);
-extern struct net_device *ne_probe(int unit);
-extern struct net_device *fmv18x_probe(int unit);
-extern struct net_device *i82596_probe(int unit);
-extern struct net_device *ni65_probe(int unit);
-extern struct net_device *sonic_probe(int unit);
-extern struct net_device *smc_init(int unit);
-extern struct net_device *atarilance_probe(int unit);
-extern struct net_device *sun3lance_probe(int unit);
-extern struct net_device *sun3_82586_probe(int unit);
-extern struct net_device *apne_probe(int unit);
-extern struct net_device *cs89x0_probe(int unit);
-extern struct net_device *mvme147lance_probe(int unit);
-extern struct net_device *tc515_probe(int unit);
-extern struct net_device *lance_probe(int unit);
-extern struct net_device *mac8390_probe(int unit);
-extern struct net_device *mac89x0_probe(int unit);
-extern struct net_device *cops_probe(int unit);
-extern struct net_device *ltpc_probe(void);
-
-/* Fibre Channel adapters */
-extern int iph5526_probe(struct net_device *dev);
-
-/* SBNI adapters */
-extern int sbni_probe(int unit);
-
 struct devprobe2 {
 	struct net_device *(*probe)(int unit);
 	int status;	/* non-zero if autoprobe has failed */
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 388ddf6..1b89ecf 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -57,6 +57,7 @@
 
 #include <net/net_namespace.h>
 #include <net/arp.h>
+#include <net/Space.h>
 
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/include/net/Space.h b/include/net/Space.h
new file mode 100644
index 0000000..8a32771
--- /dev/null
+++ b/include/net/Space.h
@@ -0,0 +1,31 @@
+/* A unified ethernet device probe.  This is the easiest way to have every
+ * ethernet adaptor have the name "eth[0123...]".
+ */
+
+struct net_device *hp100_probe(int unit);
+struct net_device *ultra_probe(int unit);
+struct net_device *wd_probe(int unit);
+struct net_device *ne_probe(int unit);
+struct net_device *fmv18x_probe(int unit);
+struct net_device *i82596_probe(int unit);
+struct net_device *ni65_probe(int unit);
+struct net_device *sonic_probe(int unit);
+struct net_device *smc_init(int unit);
+struct net_device *atarilance_probe(int unit);
+struct net_device *sun3lance_probe(int unit);
+struct net_device *sun3_82586_probe(int unit);
+struct net_device *apne_probe(int unit);
+struct net_device *cs89x0_probe(int unit);
+struct net_device *mvme147lance_probe(int unit);
+struct net_device *tc515_probe(int unit);
+struct net_device *lance_probe(int unit);
+struct net_device *mac8390_probe(int unit);
+struct net_device *mac89x0_probe(int unit);
+struct net_device *cops_probe(int unit);
+struct net_device *ltpc_probe(void);
+
+/* Fibre Channel adapters */
+int iph5526_probe(struct net_device *dev);
+
+/* SBNI adapters */
+int sbni_probe(int unit);
-- 
1.7.9.5

Re: [PATCH v3 4/8] drivers: net: Include new header file in sbni.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:22:37 +0530

> Create a new header file include/net/Space.h which contains
> prototype declaration of sbni_probe().
> 
> Include the new header file in drivers/net/Space.c and
> drivers/net/wan/sbni.c because they use this function.
> 
> This eliminates the following warning in wan/sbni.c:
> drivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Applied.

[PATCH v3 5/8] drivers: net: Mark functions as static in 3945-debug.c

[Rashika Kheria]

This patch marks the function il3945_ucode_rx_stats_read(),
il3945_ucode_tx_stats_read() and il3945_ucode_general_stats_read() in
3945-debug.c as static because they are not used outside this file.

Thus, it also removes the following warnings in
wireless/iwlegacy/3945-debug.c:

drivers/net/wireless/iwlegacy/3945-debug.c:52:1: warning: no previous prototype for ‘il3945_ucode_rx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/3945-debug.c:317:1: warning: no previous prototype for ‘il3945_ucode_tx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/3945-debug.c:407:1: warning: no previous prototype for ‘il3945_ucode_general_stats_read’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/wireless/iwlegacy/3945-debug.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/iwlegacy/3945-debug.c b/drivers/net/wireless/iwlegacy/3945-debug.c
index f767dd1..c1b4441 100644
--- a/drivers/net/wireless/iwlegacy/3945-debug.c
+++ b/drivers/net/wireless/iwlegacy/3945-debug.c
@@ -48,7 +48,7 @@ il3945_stats_flag(struct il_priv *il, char *buf, int bufsz)
 	return p;
 }
 
-ssize_t
+static ssize_t
 il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -313,7 +313,7 @@ il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -403,7 +403,7 @@ il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,
 				size_t count, loff_t *ppos)
 {
-- 
1.7.9.5

Re: [PATCH v3 5/8] drivers: net: Mark functions as static in 3945-debug.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:23:49 +0530

> This patch marks the function il3945_ucode_rx_stats_read(),
> il3945_ucode_tx_stats_read() and il3945_ucode_general_stats_read() in
> 3945-debug.c as static because they are not used outside this file.
> 
> Thus, it also removes the following warnings in
> wireless/iwlegacy/3945-debug.c:
> 
> drivers/net/wireless/iwlegacy/3945-debug.c:52:1: warning: no previous prototype for ‘il3945_ucode_rx_stats_read’ [-Wmissing-prototypes]
> drivers/net/wireless/iwlegacy/3945-debug.c:317:1: warning: no previous prototype for ‘il3945_ucode_tx_stats_read’ [-Wmissing-prototypes]
> drivers/net/wireless/iwlegacy/3945-debug.c:407:1: warning: no previous prototype for ‘il3945_ucode_general_stats_read’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Applied.

[PATCH v3 6/8] drivers: net: Mark functions as static in 4965-debug.c

[Rashika Kheria]

This patch marks the function il4965_ucode_rx_stats_read(),
il4965_ucode_tx_stats_read() and il4965_ucode_general_stats_read() in
4965-debug.c as static because they are not used outside this file.

Thus, it also removes the following warnings in
wireless/iwlegacy/4965-debug.c:

drivers/net/wireless/iwlegacy/4965-debug.c:59:1: warning: no previous prototype for ‘il4965_ucode_rx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/4965-debug.c:471:1: warning: no previous prototype for ‘il4965_ucode_tx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/4965-debug.c:637:1: warning: no previous prototype for ‘il4965_ucode_general_stats_read’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/wireless/iwlegacy/4965-debug.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/iwlegacy/4965-debug.c b/drivers/net/wireless/iwlegacy/4965-debug.c
index c8153fc..e0597bf 100644
--- a/drivers/net/wireless/iwlegacy/4965-debug.c
+++ b/drivers/net/wireless/iwlegacy/4965-debug.c
@@ -55,7 +55,7 @@ il4965_stats_flag(struct il_priv *il, char *buf, int bufsz)
 	return p;
 }
 
-ssize_t
+static ssize_t
 il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -467,7 +467,7 @@ il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -633,7 +633,7 @@ il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
 				size_t count, loff_t *ppos)
 {
-- 
1.7.9.5

Re: [PATCH v3 6/8] drivers: net: Mark functions as static in 4965-debug.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:24:38 +0530

> This patch marks the function il4965_ucode_rx_stats_read(),
> il4965_ucode_tx_stats_read() and il4965_ucode_general_stats_read() in
> 4965-debug.c as static because they are not used outside this file.
> 
> Thus, it also removes the following warnings in
> wireless/iwlegacy/4965-debug.c:
> 
> drivers/net/wireless/iwlegacy/4965-debug.c:59:1: warning: no previous prototype for ‘il4965_ucode_rx_stats_read’ [-Wmissing-prototypes]
> drivers/net/wireless/iwlegacy/4965-debug.c:471:1: warning: no previous prototype for ‘il4965_ucode_tx_stats_read’ [-Wmissing-prototypes]
> drivers/net/wireless/iwlegacy/4965-debug.c:637:1: warning: no previous prototype for ‘il4965_ucode_general_stats_read’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Applied.

[PATCH v3 7/8] drivers: net: Mark functions as static in debug.c

[Rashika Kheria]

This patch marks the function il_clear_traffic_stats() in debug.c as
static because they are not used outside this file.

Thus, it also removes the following warnings in
wireless/iwlegacy/debug.c:

drivers/net/wireless/iwlegacy/debug.c:35:1: warning: no previous prototype for ‘il_clear_traffic_stats’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/wireless/iwlegacy/debug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index eff2650..b7e03dd 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -31,7 +31,7 @@
 
 #include "common.h"
 
-void
+static void
 il_clear_traffic_stats(struct il_priv *il)
 {
 	memset(&il->tx_stats, 0, sizeof(struct traffic_stats));
-- 
1.7.9.5

Re: [PATCH v3 7/8] drivers: net: Mark functions as static in debug.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:25:34 +0530

> This patch marks the function il_clear_traffic_stats() in debug.c as
> static because they are not used outside this file.
> 
> Thus, it also removes the following warnings in
> wireless/iwlegacy/debug.c:
> 
> drivers/net/wireless/iwlegacy/debug.c:35:1: warning: no previous prototype for ‘il_clear_traffic_stats’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Applied.

[PATCH v3 8/8] drivers: net: Mark function xenvif_count_frag_slots() as static in netback.c

[Rashika Kheria]

This patch marks the function xenvif_count_frag_slots() in netback.c as
static because they are not used outside this file.

Thus, it also removes the following warning in xen-netback/netback.c:
drivers/net/xen-netback/netback.c:218:14: warning: no previous prototype for ‘xenvif_count_frag_slots’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
 drivers/net/xen-netback/netback.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 64f0e0d..9e4f399 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -215,7 +215,7 @@ struct xenvif_count_slot_state {
 	bool head;
 };
 
-unsigned int xenvif_count_frag_slots(struct xenvif *vif,
+static unsigned int xenvif_count_frag_slots(struct xenvif *vif,
 				     unsigned long offset, unsigned long size,
 				     struct xenvif_count_slot_state *state)
 {
-- 
1.7.9.5

Re: [PATCH v3 8/8] drivers: net: Mark function xenvif_count_frag_slots() as static in netback.c

[Wei Liu]

On Thu, Dec 19, 2013 at 02:26:47PM +0530, Rashika Kheria wrote:
> This patch marks the function xenvif_count_frag_slots() in netback.c as
> static because they are not used outside this file.
> 
> Thus, it also removes the following warning in xen-netback/netback.c:
> drivers/net/xen-netback/netback.c:218:14: warning: no previous prototype for ‘xenvif_count_frag_slots’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>

Easy, there's no need to resend the patch with maintainer's Acked-by.
DaveM will take care of this. Just be patient. :-)

Wei.

Re: [PATCH v3 8/8] drivers: net: Mark function xenvif_count_frag_slots() as static in netback.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:26:47 +0530

> This patch marks the function xenvif_count_frag_slots() in netback.c as
> static because they are not used outside this file.
> 
> Thus, it also removes the following warning in xen-netback/netback.c:
> drivers/net/xen-netback/netback.c:218:14: warning: no previous prototype for ‘xenvif_count_frag_slots’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>

This patch doesn't apply cleanly to net-next, please respin.

Thanks.

RE: [PATCH v3 8/8] drivers: net: Mark function xenvif_count_frag_slots() as static in netback.c

[Paul Durrant]

> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of David Miller
> Sent: 19 December 2013 23:53
> To: rashika.kheria@gmail.com
> Cc: Ian Campbell; Wei Liu; xen-devel@lists.xenproject.org;
> netdev@vger.kernel.org; linux-kernel@vger.kernel.org;
> josh@joshtriplett.org
> Subject: Re: [PATCH v3 8/8] drivers: net: Mark function
> xenvif_count_frag_slots() as static in netback.c
> 
> From: Rashika Kheria <rashika.kheria@gmail.com>
> Date: Thu, 19 Dec 2013 14:26:47 +0530
> 
> > This patch marks the function xenvif_count_frag_slots() in netback.c as
> > static because they are not used outside this file.
> >
> > Thus, it also removes the following warning in xen-netback/netback.c:
> > drivers/net/xen-netback/netback.c:218:14: warning: no previous
> prototype for ʽxenvif_count_frag_slotsʼ [-Wmissing-prototypes]
> >
> > Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> > Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> This patch doesn't apply cleanly to net-next, please respin.
> 

It won't apply to net-next. I removed that function in c/s ca2f09f2b2c6c25047cfc545d057c4edfcfe561c.

  Paul

RE: [PATCH v3 1/8] drivers: net: Mark functions as static in qlcnic_io.c

[Shahed Shaikh]

> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Rashika Kheria
> Sent: Thursday, December 19, 2013 2:17 PM
> To: linux-kernel; Himanshu Madhani; Rajesh Borundia; Shahed Shaikh;
> Jitendra Kalsaria; Sony Chacko; Sucheta Chakraborty; Dept-Eng Linux Driver;
> netdev; josh@joshtriplett.org
> Subject: [PATCH v3 1/8] drivers: net: Mark functions as static in qlcnic_io.c
> 
> This patch marks the function qlcnic_enable_tx_intr(),
> qlcnic_83xx_enable_tx_intr() and qlcnic_83xx_disable_tx_intr() in qlcnic_io.c
> as static because they are not used outside this file.
> 
> Thus, it also removes the following warnings in
> ethernet/qlogic/qlcnic/qlcnic_io.c:
> 
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:130:13: warning: no previous
> prototype for ‘qlcnic_enable_tx_intr’ [-Wmissing-prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:147:13: warning: no previous
> prototype for ‘qlcnic_83xx_enable_tx_intr’ [-Wmissing-prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:153:13: warning: no previous
> prototype for ‘qlcnic_83xx_disable_tx_intr’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Acked-by: Shahed Shaikh <shahed.shaikh@qlogic.com>

Thanks,
Shahed

Re: [PATCH v3 1/8] drivers: net: Mark functions as static in qlcnic_io.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Thu, 19 Dec 2013 14:17:27 +0530

> This patch marks the function qlcnic_enable_tx_intr(),
> qlcnic_83xx_enable_tx_intr() and qlcnic_83xx_disable_tx_intr() in
> qlcnic_io.c as static because they are not used outside this file.
> 
> Thus, it also removes the following warnings in
> ethernet/qlogic/qlcnic/qlcnic_io.c:
> 
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:130:13: warning: no previous prototype for ‘qlcnic_enable_tx_intr’ [-Wmissing-prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:147:13: warning: no previous prototype for ‘qlcnic_83xx_enable_tx_intr’ [-Wmissing-prototypes]
> drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c:153:13: warning: no previous prototype for ‘qlcnic_83xx_disable_tx_intr’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Applied.

[PATCH v2 3/9] drivers: net: Mark functions as static in qlcnic_83xx_hw.c

[Rashika Kheria]

This patch marks the function qlcnic_83xx_clear_legacy_intr_mask(),
qlcnic_83xx_set_legacy_intr_mask() and
qlcnic_83xx_enable_legacy_msix_mbx_intr() in qlcnic_83xx_hw.c as static
because they are not used outside this file.

Thus, it also removes the following warnings
in ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:318:13: warning: no previous prototype for ‘qlcnic_83xx_clear_legacy_intr_mask’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:323:13: warning: no previous prototype for ‘qlcnic_83xx_set_legacy_intr_mask’ [-Wmissing-prototypes]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c:343:13: warning: no previous prototype for ‘qlcnic_83xx_enable_legacy_msix_mbx_intr’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index b1cb0ff..d0c2cd4 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -315,12 +315,12 @@ int qlcnic_83xx_setup_intr(struct qlcnic_adapter *adapter)
 	return 0;
 }
 
-inline void qlcnic_83xx_clear_legacy_intr_mask(struct qlcnic_adapter *adapter)
+static inline void qlcnic_83xx_clear_legacy_intr_mask(struct qlcnic_adapter *adapter)
 {
 	writel(0, adapter->tgt_mask_reg);
 }
 
-inline void qlcnic_83xx_set_legacy_intr_mask(struct qlcnic_adapter *adapter)
+static inline void qlcnic_83xx_set_legacy_intr_mask(struct qlcnic_adapter *adapter)
 {
 	if (adapter->tgt_mask_reg)
 		writel(1, adapter->tgt_mask_reg);
@@ -340,7 +340,7 @@ void qlcnic_83xx_disable_intr(struct qlcnic_adapter *adapter,
 	writel(1, sds_ring->crb_intr_mask);
 }
 
-inline void qlcnic_83xx_enable_legacy_msix_mbx_intr(struct qlcnic_adapter
+static inline void qlcnic_83xx_enable_legacy_msix_mbx_intr(struct qlcnic_adapter
 						    *adapter)
 {
 	u32 mask;
-- 
1.7.9.5

[PATCH v2 4/9] drivers: net: Mark functions as static in stmmac_platform.c

[Rashika Kheria]

This patch marks the function stmmac_pltfr_freeze() and
stmmac_pltfr_restore() in stmmac_platform.c as static because they are
not used outside this file.

Thus, it also removes the following warnings in
ethernet/stmicro/stmmac/stmmac_platform.c:

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:222:5: warning: no previous prototype for ‘stmmac_pltfr_freeze’ [-Wmissing-prototypes]
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:236:5: warning: no previous prototype for ‘stmmac_pltfr_restore’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 51c9069..38bd1f4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -219,7 +219,7 @@ static int stmmac_pltfr_resume(struct device *dev)
 	return stmmac_resume(ndev);
 }
 
-int stmmac_pltfr_freeze(struct device *dev)
+static int stmmac_pltfr_freeze(struct device *dev)
 {
 	int ret;
 	struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
@@ -233,7 +233,7 @@ int stmmac_pltfr_freeze(struct device *dev)
 	return ret;
 }
 
-int stmmac_pltfr_restore(struct device *dev)
+static int stmmac_pltfr_restore(struct device *dev)
 {
 	struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
 	struct net_device *ndev = dev_get_drvdata(dev);
-- 
1.7.9.5

[PATCH v2 5/9] drivers: net: Put prototype declaration for function sbni_probe() in sbni.c

[Rashika Kheria]

This patch declares the prototype for the function sbni_probe() in file sbni.c.

Thus, it also removes the following warning in wan/sbni.c:
drivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
---

This revision fixes the following issues of the previous revision:
Incorrect fix

 drivers/net/wan/sbni.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 388ddf6..5061ffd 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -221,6 +221,7 @@ static void __init sbni_devsetup(struct net_device *dev)
 	dev->netdev_ops = &sbni_netdev_ops;
 }
 
+int __init sbni_probe(int unit);
 int __init sbni_probe(int unit)
 {
 	struct net_device *dev;
-- 
1.7.9.5

Re: [PATCH v2 5/9] drivers: net: Put prototype declaration for function sbni_probe() in sbni.c

[Josh Triplett]

On Sat, Dec 14, 2013 at 05:55:42PM +0530, Rashika Kheria wrote:
> This patch declares the prototype for the function sbni_probe() in file sbni.c.
> 
> Thus, it also removes the following warning in wan/sbni.c:
> drivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>

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

>  drivers/net/wan/sbni.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
> index 388ddf6..5061ffd 100644
> --- a/drivers/net/wan/sbni.c
> +++ b/drivers/net/wan/sbni.c
> @@ -221,6 +221,7 @@ static void __init sbni_devsetup(struct net_device *dev)
>  	dev->netdev_ops = &sbni_netdev_ops;
>  }
>  
> +int __init sbni_probe(int unit);
>  int __init sbni_probe(int unit)
>  {
>  	struct net_device *dev;
> -- 
> 1.7.9.5
> 

Re: [PATCH v2 5/9] drivers: net: Put prototype declaration for function sbni_probe() in sbni.c

[David Miller]

From: Rashika Kheria <rashika.kheria@gmail.com>
Date: Sat, 14 Dec 2013 17:55:42 +0530

> This patch declares the prototype for the function sbni_probe() in file sbni.c.
> 
> Thus, it also removes the following warning in wan/sbni.c:
> drivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> ---
> 
> This revision fixes the following issues of the previous revision:
> Incorrect fix
> 
>  drivers/net/wan/sbni.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
> index 388ddf6..5061ffd 100644
> --- a/drivers/net/wan/sbni.c
> +++ b/drivers/net/wan/sbni.c
> @@ -221,6 +221,7 @@ static void __init sbni_devsetup(struct net_device *dev)
>  	dev->netdev_ops = &sbni_netdev_ops;
>  }
>  
> +int __init sbni_probe(int unit);
>  int __init sbni_probe(int unit)

This is not the correct way to fix this kind of warning, an exported
function needs to appear in a header file so that both the definition
and any callers of this function will see the same declaration in that
header file.

Re: [PATCH v2 5/9] drivers: net: Put prototype declaration for function sbni_probe() in sbni.c

[Josh Triplett]

On Sat, Dec 14, 2013 at 10:26:58PM -0500, David Miller wrote:
> From: Rashika Kheria <rashika.kheria@gmail.com>
> Date: Sat, 14 Dec 2013 17:55:42 +0530
> 
> > This patch declares the prototype for the function sbni_probe() in file sbni.c.
> > 
> > Thus, it also removes the following warning in wan/sbni.c:
> > drivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]
> > 
> > Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> > ---
> > 
> > This revision fixes the following issues of the previous revision:
> > Incorrect fix
> > 
> >  drivers/net/wan/sbni.c |    1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
> > index 388ddf6..5061ffd 100644
> > --- a/drivers/net/wan/sbni.c
> > +++ b/drivers/net/wan/sbni.c
> > @@ -221,6 +221,7 @@ static void __init sbni_devsetup(struct net_device *dev)
> >  	dev->netdev_ops = &sbni_netdev_ops;
> >  }
> >  
> > +int __init sbni_probe(int unit);
> >  int __init sbni_probe(int unit)
> 
> This is not the correct way to fix this kind of warning, an exported
> function needs to appear in a header file so that both the definition
> and any callers of this function will see the same declaration in that
> header file.

It should, yes; however, in this case, the function is one of several
dozen that are directly prototyped and used by drivers/net/Space.c, and
there's no header file prototyping any of those functions.

Do you have a suggestion for what header file should contain a prototype
for this probe function?

- Josh Triplett

Re: [PATCH v2 5/9] drivers: net: Put prototype declaration for function sbni_probe() in sbni.c

[David Miller]

From: Josh Triplett <josh@joshtriplett.org>
Date: Sat, 14 Dec 2013 19:41:49 -0800

> On Sat, Dec 14, 2013 at 10:26:58PM -0500, David Miller wrote:
>> From: Rashika Kheria <rashika.kheria@gmail.com>
>> Date: Sat, 14 Dec 2013 17:55:42 +0530
>> 
>> > This patch declares the prototype for the function sbni_probe() in file sbni.c.
>> > 
>> > Thus, it also removes the following warning in wan/sbni.c:
>> > drivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]
>> > 
>> > Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
>> > ---
>> > 
>> > This revision fixes the following issues of the previous revision:
>> > Incorrect fix
>> > 
>> >  drivers/net/wan/sbni.c |    1 +
>> >  1 file changed, 1 insertion(+)
>> > 
>> > diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
>> > index 388ddf6..5061ffd 100644
>> > --- a/drivers/net/wan/sbni.c
>> > +++ b/drivers/net/wan/sbni.c
>> > @@ -221,6 +221,7 @@ static void __init sbni_devsetup(struct net_device *dev)
>> >  	dev->netdev_ops = &sbni_netdev_ops;
>> >  }
>> >  
>> > +int __init sbni_probe(int unit);
>> >  int __init sbni_probe(int unit)
>> 
>> This is not the correct way to fix this kind of warning, an exported
>> function needs to appear in a header file so that both the definition
>> and any callers of this function will see the same declaration in that
>> header file.
> 
> It should, yes; however, in this case, the function is one of several
> dozen that are directly prototyped and used by drivers/net/Space.c, and
> there's no header file prototyping any of those functions.
> 
> Do you have a suggestion for what header file should contain a prototype
> for this probe function?

Then create a Space.h for this.

Otherwise if something accidently makes the function signatures not match
at the call site vs. the definition, or vice versa, nothing will catch it.

[PATCH v2 6/9] drivers: net: Mark functions as static in 3945-debug.c

[Rashika Kheria]

This patch marks the function il3945_ucode_rx_stats_read(),
il3945_ucode_tx_stats_read() and il3945_ucode_general_stats_read() in
3945-debug.c as static because they are not used outside this file.

Thus, it also removes the following warnings in
wireless/iwlegacy/3945-debug.c:

drivers/net/wireless/iwlegacy/3945-debug.c:52:1: warning: no previous prototype for ‘il3945_ucode_rx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/3945-debug.c:317:1: warning: no previous prototype for ‘il3945_ucode_tx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/3945-debug.c:407:1: warning: no previous prototype for ‘il3945_ucode_general_stats_read’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/wireless/iwlegacy/3945-debug.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/iwlegacy/3945-debug.c b/drivers/net/wireless/iwlegacy/3945-debug.c
index f767dd1..c1b4441 100644
--- a/drivers/net/wireless/iwlegacy/3945-debug.c
+++ b/drivers/net/wireless/iwlegacy/3945-debug.c
@@ -48,7 +48,7 @@ il3945_stats_flag(struct il_priv *il, char *buf, int bufsz)
 	return p;
 }
 
-ssize_t
+static ssize_t
 il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -313,7 +313,7 @@ il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -403,7 +403,7 @@ il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,
 				size_t count, loff_t *ppos)
 {
-- 
1.7.9.5

[PATCH v2 7/9] drivers: net: Mark functions as static in 4965-debug.c

[Rashika Kheria]

This patch marks the function il4965_ucode_rx_stats_read(),
il4965_ucode_tx_stats_read() and il4965_ucode_general_stats_read() in
4965-debug.c as static because they are not used outside this file.

Thus, it also removes the following warnings in
wireless/iwlegacy/4965-debug.c:

drivers/net/wireless/iwlegacy/4965-debug.c:59:1: warning: no previous prototype for ‘il4965_ucode_rx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/4965-debug.c:471:1: warning: no previous prototype for ‘il4965_ucode_tx_stats_read’ [-Wmissing-prototypes]
drivers/net/wireless/iwlegacy/4965-debug.c:637:1: warning: no previous prototype for ‘il4965_ucode_general_stats_read’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/wireless/iwlegacy/4965-debug.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/iwlegacy/4965-debug.c b/drivers/net/wireless/iwlegacy/4965-debug.c
index c8153fc..e0597bf 100644
--- a/drivers/net/wireless/iwlegacy/4965-debug.c
+++ b/drivers/net/wireless/iwlegacy/4965-debug.c
@@ -55,7 +55,7 @@ il4965_stats_flag(struct il_priv *il, char *buf, int bufsz)
 	return p;
 }
 
-ssize_t
+static ssize_t
 il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -467,7 +467,7 @@ il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 			   size_t count, loff_t *ppos)
 {
@@ -633,7 +633,7 @@ il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 	return ret;
 }
 
-ssize_t
+static ssize_t
 il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
 				size_t count, loff_t *ppos)
 {
-- 
1.7.9.5

Re: [PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 701 bytes --]

On Sat, 2013-12-14 at 17:44 +0530, Rashika Kheria wrote:
> This patch removes the function igb_get_eee_status_i354() in
> e1000_82575.c because it is unused.
> 
> It thus eliminates the following warning in
> ethernet/intel/igb/e1000_82575.c:
> drivers/net/ethernet/intel/igb/e1000_82575.c:2591:5: warning: no
> previous prototype for
> ‘igb_get_eee_status_i354’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> ---
>  drivers/net/ethernet/intel/igb/e1000_82575.c |   32
> --------------------------
>  1 file changed, 32 deletions(-)

Thanks Rashika, I have added the patch to my queue.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH v2 8/9] drivers: net: Mark functions as static in debug.c

[Rashika Kheria]

This patch marks the function il_clear_traffic_stats() in debug.c as
static because they are not used outside this file.

Thus, it also removes the following warnings in
wireless/iwlegacy/debug.c:

drivers/net/wireless/iwlegacy/debug.c:35:1: warning: no previous prototype for ‘il_clear_traffic_stats’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---
 drivers/net/wireless/iwlegacy/debug.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index eff2650..b7e03dd 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -31,7 +31,7 @@
 
 #include "common.h"
 
-void
+static void
 il_clear_traffic_stats(struct il_priv *il)
 {
 	memset(&il->tx_stats, 0, sizeof(struct traffic_stats));
-- 
1.7.9.5

[PATCH v2 9/9] drivers: net: Mark function xenvif_count_frag_slots() as static in netback.c

[Rashika Kheria]

This patch marks the function xenvif_count_frag_slots() in netback.c as
static because they are not used outside this file.

Thus, it also removes the following warning in xen-netback/netback.c:
drivers/net/xen-netback/netback.c:218:14: warning: no previous prototype for ‘xenvif_count_frag_slots’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---

This revision fixes the following issues of the previous revision:
Change commit message subject

 drivers/net/xen-netback/netback.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 64f0e0d..9e4f399 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -215,7 +215,7 @@ struct xenvif_count_slot_state {
 	bool head;
 };
 
-unsigned int xenvif_count_frag_slots(struct xenvif *vif,
+static unsigned int xenvif_count_frag_slots(struct xenvif *vif,
 				     unsigned long offset, unsigned long size,
 				     struct xenvif_count_slot_state *state)
 {
-- 
1.7.9.5

Re: [PATCH v2 9/9] drivers: net: Mark function xenvif_count_frag_slots() as static in netback.c

[Ian Campbell]

On Sat, 2013-12-14 at 18:02 +0530, Rashika Kheria wrote:
> This patch marks the function xenvif_count_frag_slots() in netback.c as
> static because they are not used outside this file.
> 
> Thus, it also removes the following warning in xen-netback/netback.c:
> drivers/net/xen-netback/netback.c:218:14: warning: no previous prototype for ‘xenvif_count_frag_slots’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
> 
> This revision fixes the following issues of the previous revision:
> Change commit message subject
> 
>  drivers/net/xen-netback/netback.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 64f0e0d..9e4f399 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -215,7 +215,7 @@ struct xenvif_count_slot_state {
>  	bool head;
>  };
>  
> -unsigned int xenvif_count_frag_slots(struct xenvif *vif,
> +static unsigned int xenvif_count_frag_slots(struct xenvif *vif,
>  				     unsigned long offset, unsigned long size,
>  				     struct xenvif_count_slot_state *state)
>  {

RE: [PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[Wyborny, Carolyn]

> -----Original Message-----
> From: Rashika Kheria [mailto:rashika.kheria@gmail.com]
> Sent: Saturday, December 14, 2013 4:15 AM
> To: linux-kernel@vger.kernel.org
> Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny, Carolyn;
> Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr, Peter P; Duyck, Alexander
> H; Ronciak, John; Dave, Tushar N; Abodunrin, Akeem G; Vick, Matthew; e1000-
> devel@lists.sourceforge.net; netdev@vger.kernel.org; josh@joshtriplett.org
> Subject: [PATCH v2 1/9] drivers: net: Remove unused function
> igb_get_eee_status_i354() in e1000_82575.c
> 
> This patch removes the function igb_get_eee_status_i354() in e1000_82575.c
> because it is unused.
> 
> It thus eliminates the following warning in
> ethernet/intel/igb/e1000_82575.c:
> drivers/net/ethernet/intel/igb/e1000_82575.c:2591:5: warning: no previous
> prototype for ‘igb_get_eee_status_i354’ [-Wmissing-prototypes]
> 
> Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> ---
>  drivers/net/ethernet/intel/igb/e1000_82575.c |   32 --------------------------
>  1 file changed, 32 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c
> b/drivers/net/ethernet/intel/igb/e1000_82575.c
> index 47c2d10..18e5200 100644
> --- a/drivers/net/ethernet/intel/igb/e1000_82575.c
> +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
> @@ -2580,38 +2580,6 @@ out:
>  	return ret_val;
>  }
> 
> -/**
> - *  igb_get_eee_status_i354 - Get EEE status
> - *  @hw: pointer to the HW structure
> - *  @status: EEE status
> - *
> - *  Get EEE status by guessing based on whether Tx or Rx LPI indications have
> - *  been received.
> - **/
> -s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status) -{
> -	struct e1000_phy_info *phy = &hw->phy;
> -	s32 ret_val = 0;
> -	u16 phy_data;
> -
> -	/* Check if EEE is supported on this device. */
> -	if ((hw->phy.media_type != e1000_media_type_copper) ||
> -	    (phy->id != M88E1543_E_PHY_ID))
> -		goto out;
> -
> -	ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
> -				     E1000_PCS_STATUS_DEV_I354,
> -				     &phy_data);
> -	if (ret_val)
> -		goto out;
> -
> -	*status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
> -			      E1000_PCS_STATUS_RX_LPI_RCVD) ? true : false;
> -
> -out:
> -	return ret_val;
> -}
> -
>  static const u8 e1000_emc_temp_data[4] = {
>  	E1000_EMC_INTERNAL_DATA,
>  	E1000_EMC_DIODE1_DATA,
> --
> 1.7.9.5

NACK.

Thanks for the patch Rashika, but this is the incorrect fix for this warning  The function is called in the igb_probe function, so you cannot remove it and I see the prototype in the e1000_82575.h file.  Can you double check your source pull?

Thanks,

Carolyn

Carolyn Wyborny 
Linux Development 
Networking Division 
Intel Corporation 

Re: [PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[Josh Triplett]

On Mon, Dec 16, 2013 at 05:11:25PM +0000, Wyborny, Carolyn wrote:
> > -----Original Message-----
> > From: Rashika Kheria [mailto:rashika.kheria@gmail.com]
> > Sent: Saturday, December 14, 2013 4:15 AM
> > To: linux-kernel@vger.kernel.org
> > Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny, Carolyn;
> > Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr, Peter P; Duyck, Alexander
> > H; Ronciak, John; Dave, Tushar N; Abodunrin, Akeem G; Vick, Matthew; e1000-
> > devel@lists.sourceforge.net; netdev@vger.kernel.org; josh@joshtriplett.org
> > Subject: [PATCH v2 1/9] drivers: net: Remove unused function
> > igb_get_eee_status_i354() in e1000_82575.c
> > 
> > This patch removes the function igb_get_eee_status_i354() in e1000_82575.c
> > because it is unused.
> > 
> > It thus eliminates the following warning in
> > ethernet/intel/igb/e1000_82575.c:
> > drivers/net/ethernet/intel/igb/e1000_82575.c:2591:5: warning: no previous
> > prototype for ‘igb_get_eee_status_i354’ [-Wmissing-prototypes]
> > 
> > Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> > Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> > ---
> >  drivers/net/ethernet/intel/igb/e1000_82575.c |   32 --------------------------
> >  1 file changed, 32 deletions(-)
> > 
> > diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > index 47c2d10..18e5200 100644
> > --- a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > @@ -2580,38 +2580,6 @@ out:
> >  	return ret_val;
> >  }
> > 
> > -/**
> > - *  igb_get_eee_status_i354 - Get EEE status
> > - *  @hw: pointer to the HW structure
> > - *  @status: EEE status
> > - *
> > - *  Get EEE status by guessing based on whether Tx or Rx LPI indications have
> > - *  been received.
> > - **/
> > -s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status) -{
> > -	struct e1000_phy_info *phy = &hw->phy;
> > -	s32 ret_val = 0;
> > -	u16 phy_data;
> > -
> > -	/* Check if EEE is supported on this device. */
> > -	if ((hw->phy.media_type != e1000_media_type_copper) ||
> > -	    (phy->id != M88E1543_E_PHY_ID))
> > -		goto out;
> > -
> > -	ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
> > -				     E1000_PCS_STATUS_DEV_I354,
> > -				     &phy_data);
> > -	if (ret_val)
> > -		goto out;
> > -
> > -	*status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
> > -			      E1000_PCS_STATUS_RX_LPI_RCVD) ? true : false;
> > -
> > -out:
> > -	return ret_val;
> > -}
> > -
> >  static const u8 e1000_emc_temp_data[4] = {
> >  	E1000_EMC_INTERNAL_DATA,
> >  	E1000_EMC_DIODE1_DATA,
> > --
> > 1.7.9.5
> 
> NACK.
> 
> Thanks for the patch Rashika, but this is the incorrect fix for this
> warning  The function is called in the igb_probe function, so you
> cannot remove it and I see the prototype in the e1000_82575.h file.
> Can you double check your source pull?

From top-of-tree linux.git:

~/src/linux$ git grep igb_get_eee_status_i354
drivers/net/ethernet/intel/igb/e1000_82575.c: *  igb_get_eee_status_i354 - Get EEE status
drivers/net/ethernet/intel/igb/e1000_82575.c:s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status)

A comment and the function itself; no other references.  In what tree
are you seeing a reference to igb_get_eee_status_i354?

- Josh Triplett

RE: [PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[Wyborny, Carolyn]

> -----Original Message-----
> From: Josh Triplett [mailto:josh@joshtriplett.org]
> Sent: Monday, December 16, 2013 9:43 AM
> To: Wyborny, Carolyn
> Cc: Rashika Kheria; linux-kernel@vger.kernel.org; Kirsher, Jeffrey T; Brandeburg,
> Jesse; Allan, Bruce W; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr,
> Peter P; Duyck, Alexander H; Ronciak, John; Dave, Tushar N; Abodunrin, Akeem
> G; Vick, Matthew; e1000-devel@lists.sourceforge.net; netdev@vger.kernel.org
> Subject: Re: [PATCH v2 1/9] drivers: net: Remove unused function
> igb_get_eee_status_i354() in e1000_82575.c
> 
> On Mon, Dec 16, 2013 at 05:11:25PM +0000, Wyborny, Carolyn wrote:
> > > -----Original Message-----
> > > From: Rashika Kheria [mailto:rashika.kheria@gmail.com]
> > > Sent: Saturday, December 14, 2013 4:15 AM
> > > To: linux-kernel@vger.kernel.org
> > > Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny,
> > > Carolyn; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr, Peter
> > > P; Duyck, Alexander H; Ronciak, John; Dave, Tushar N; Abodunrin,
> > > Akeem G; Vick, Matthew; e1000- devel@lists.sourceforge.net;
> > > netdev@vger.kernel.org; josh@joshtriplett.org
> > > Subject: [PATCH v2 1/9] drivers: net: Remove unused function
> > > igb_get_eee_status_i354() in e1000_82575.c
> > >
> > > This patch removes the function igb_get_eee_status_i354() in
> > > e1000_82575.c because it is unused.
> > >
> > > It thus eliminates the following warning in
> > > ethernet/intel/igb/e1000_82575.c:
> > > drivers/net/ethernet/intel/igb/e1000_82575.c:2591:5: warning: no
> > > previous prototype for ‘igb_get_eee_status_i354’
> > > [-Wmissing-prototypes]
> > >
> > > Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> > > Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> > > ---
> > >  drivers/net/ethernet/intel/igb/e1000_82575.c |   32 --------------------------
> > >  1 file changed, 32 deletions(-)
> > >
> > > diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > index 47c2d10..18e5200 100644
> > > --- a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > @@ -2580,38 +2580,6 @@ out:
> > >  	return ret_val;
> > >  }
> > >
> > > -/**
> > > - *  igb_get_eee_status_i354 - Get EEE status
> > > - *  @hw: pointer to the HW structure
> > > - *  @status: EEE status
> > > - *
> > > - *  Get EEE status by guessing based on whether Tx or Rx LPI
> > > indications have
> > > - *  been received.
> > > - **/
> > > -s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status) -{
> > > -	struct e1000_phy_info *phy = &hw->phy;
> > > -	s32 ret_val = 0;
> > > -	u16 phy_data;
> > > -
> > > -	/* Check if EEE is supported on this device. */
> > > -	if ((hw->phy.media_type != e1000_media_type_copper) ||
> > > -	    (phy->id != M88E1543_E_PHY_ID))
> > > -		goto out;
> > > -
> > > -	ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
> > > -				     E1000_PCS_STATUS_DEV_I354,
> > > -				     &phy_data);
> > > -	if (ret_val)
> > > -		goto out;
> > > -
> > > -	*status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
> > > -			      E1000_PCS_STATUS_RX_LPI_RCVD) ? true : false;
> > > -
> > > -out:
> > > -	return ret_val;
> > > -}
> > > -
> > >  static const u8 e1000_emc_temp_data[4] = {
> > >  	E1000_EMC_INTERNAL_DATA,
> > >  	E1000_EMC_DIODE1_DATA,
> > > --
> > > 1.7.9.5
> >
> > NACK.
> >
> > Thanks for the patch Rashika, but this is the incorrect fix for this
> > warning  The function is called in the igb_probe function, so you
> > cannot remove it and I see the prototype in the e1000_82575.h file.
> > Can you double check your source pull?
> 
> From top-of-tree linux.git:
> 
> ~/src/linux$ git grep igb_get_eee_status_i354
> drivers/net/ethernet/intel/igb/e1000_82575.c: *  igb_get_eee_status_i354 - Get
> EEE status
> drivers/net/ethernet/intel/igb/e1000_82575.c:s32jjj
> igb_get_eee_status_i354(struct e1000_hw *hw, bool *status)
> 
> A comment and the function itself; no other references.  In what tree are you
> seeing a reference to igb_get_eee_status_i354?
> 
> - Josh Triplett

Thanks Josh,

My mistake.  I was looking at the "get" not "set" function.  However, this is still not the right fix for the driver as the actual problem is the missing code that is supposed to be calling that function in igb_get_eee in igb_ethtool.c.  The function needs to stay.  I will submit the correct fix ASAP.

Thanks,

Carolyn

Re: [PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[Josh Triplett]

On Mon, Dec 16, 2013 at 06:17:40PM +0000, Wyborny, Carolyn wrote:
> 
> 
> > -----Original Message-----
> > From: Josh Triplett [mailto:josh@joshtriplett.org]
> > Sent: Monday, December 16, 2013 9:43 AM
> > To: Wyborny, Carolyn
> > Cc: Rashika Kheria; linux-kernel@vger.kernel.org; Kirsher, Jeffrey T; Brandeburg,
> > Jesse; Allan, Bruce W; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr,
> > Peter P; Duyck, Alexander H; Ronciak, John; Dave, Tushar N; Abodunrin, Akeem
> > G; Vick, Matthew; e1000-devel@lists.sourceforge.net; netdev@vger.kernel.org
> > Subject: Re: [PATCH v2 1/9] drivers: net: Remove unused function
> > igb_get_eee_status_i354() in e1000_82575.c
> > 
> > On Mon, Dec 16, 2013 at 05:11:25PM +0000, Wyborny, Carolyn wrote:
> > > > -----Original Message-----
> > > > From: Rashika Kheria [mailto:rashika.kheria@gmail.com]
> > > > Sent: Saturday, December 14, 2013 4:15 AM
> > > > To: linux-kernel@vger.kernel.org
> > > > Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny,
> > > > Carolyn; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr, Peter
> > > > P; Duyck, Alexander H; Ronciak, John; Dave, Tushar N; Abodunrin,
> > > > Akeem G; Vick, Matthew; e1000- devel@lists.sourceforge.net;
> > > > netdev@vger.kernel.org; josh@joshtriplett.org
> > > > Subject: [PATCH v2 1/9] drivers: net: Remove unused function
> > > > igb_get_eee_status_i354() in e1000_82575.c
> > > >
> > > > This patch removes the function igb_get_eee_status_i354() in
> > > > e1000_82575.c because it is unused.
> > > >
> > > > It thus eliminates the following warning in
> > > > ethernet/intel/igb/e1000_82575.c:
> > > > drivers/net/ethernet/intel/igb/e1000_82575.c:2591:5: warning: no
> > > > previous prototype for ‘igb_get_eee_status_i354’
> > > > [-Wmissing-prototypes]
> > > >
> > > > Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> > > > Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> > > > ---
> > > >  drivers/net/ethernet/intel/igb/e1000_82575.c |   32 --------------------------
> > > >  1 file changed, 32 deletions(-)
> > > >
> > > > diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > index 47c2d10..18e5200 100644
> > > > --- a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > @@ -2580,38 +2580,6 @@ out:
> > > >  	return ret_val;
> > > >  }
> > > >
> > > > -/**
> > > > - *  igb_get_eee_status_i354 - Get EEE status
> > > > - *  @hw: pointer to the HW structure
> > > > - *  @status: EEE status
> > > > - *
> > > > - *  Get EEE status by guessing based on whether Tx or Rx LPI
> > > > indications have
> > > > - *  been received.
> > > > - **/
> > > > -s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status) -{
> > > > -	struct e1000_phy_info *phy = &hw->phy;
> > > > -	s32 ret_val = 0;
> > > > -	u16 phy_data;
> > > > -
> > > > -	/* Check if EEE is supported on this device. */
> > > > -	if ((hw->phy.media_type != e1000_media_type_copper) ||
> > > > -	    (phy->id != M88E1543_E_PHY_ID))
> > > > -		goto out;
> > > > -
> > > > -	ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
> > > > -				     E1000_PCS_STATUS_DEV_I354,
> > > > -				     &phy_data);
> > > > -	if (ret_val)
> > > > -		goto out;
> > > > -
> > > > -	*status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
> > > > -			      E1000_PCS_STATUS_RX_LPI_RCVD) ? true : false;
> > > > -
> > > > -out:
> > > > -	return ret_val;
> > > > -}
> > > > -
> > > >  static const u8 e1000_emc_temp_data[4] = {
> > > >  	E1000_EMC_INTERNAL_DATA,
> > > >  	E1000_EMC_DIODE1_DATA,
> > > > --
> > > > 1.7.9.5
> > >
> > > NACK.
> > >
> > > Thanks for the patch Rashika, but this is the incorrect fix for this
> > > warning  The function is called in the igb_probe function, so you
> > > cannot remove it and I see the prototype in the e1000_82575.h file.
> > > Can you double check your source pull?
> > 
> > From top-of-tree linux.git:
> > 
> > ~/src/linux$ git grep igb_get_eee_status_i354
> > drivers/net/ethernet/intel/igb/e1000_82575.c: *  igb_get_eee_status_i354 - Get
> > EEE status
> > drivers/net/ethernet/intel/igb/e1000_82575.c:s32jjj
> > igb_get_eee_status_i354(struct e1000_hw *hw, bool *status)
> > 
> > A comment and the function itself; no other references.  In what tree are you
> > seeing a reference to igb_get_eee_status_i354?
> > 
> > - Josh Triplett
> 
> Thanks Josh,
> 
> My mistake.  I was looking at the "get" not "set" function.  However, this is still not the right fix for the driver as the actual problem is the missing code that is supposed to be calling that function in igb_get_eee in igb_ethtool.c.  The function needs to stay.  I will submit the correct fix ASAP.

Ah, that makes sense.  Can you please Cc Rashika and myself on that
patch, with a Reported-by for Rashika?

- Josh Triplett

RE: [PATCH v2 1/9] drivers: net: Remove unused function igb_get_eee_status_i354() in e1000_82575.c

[Wyborny, Carolyn]

> -----Original Message-----
> From: Josh Triplett [mailto:josh@joshtriplett.org]
> Sent: Monday, December 16, 2013 10:22 AM
> To: Wyborny, Carolyn
> Cc: Rashika Kheria; linux-kernel@vger.kernel.org; Kirsher, Jeffrey T; Brandeburg,
> Jesse; Allan, Bruce W; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr,
> Peter P; Duyck, Alexander H; Ronciak, John; Dave, Tushar N; Abodunrin, Akeem
> G; Vick, Matthew; e1000-devel@lists.sourceforge.net; netdev@vger.kernel.org
> Subject: Re: [PATCH v2 1/9] drivers: net: Remove unused function
> igb_get_eee_status_i354() in e1000_82575.c
> 
> On Mon, Dec 16, 2013 at 06:17:40PM +0000, Wyborny, Carolyn wrote:
> >
> >
> > > -----Original Message-----
> > > From: Josh Triplett [mailto:josh@joshtriplett.org]
> > > Sent: Monday, December 16, 2013 9:43 AM
> > > To: Wyborny, Carolyn
> > > Cc: Rashika Kheria; linux-kernel@vger.kernel.org; Kirsher, Jeffrey
> > > T; Brandeburg, Jesse; Allan, Bruce W; Skidmore, Donald C; Rose,
> > > Gregory V; Waskiewicz Jr, Peter P; Duyck, Alexander H; Ronciak,
> > > John; Dave, Tushar N; Abodunrin, Akeem G; Vick, Matthew;
> > > e1000-devel@lists.sourceforge.net; netdev@vger.kernel.org
> > > Subject: Re: [PATCH v2 1/9] drivers: net: Remove unused function
> > > igb_get_eee_status_i354() in e1000_82575.c
> > >
> > > On Mon, Dec 16, 2013 at 05:11:25PM +0000, Wyborny, Carolyn wrote:
> > > > > -----Original Message-----
> > > > > From: Rashika Kheria [mailto:rashika.kheria@gmail.com]
> > > > > Sent: Saturday, December 14, 2013 4:15 AM
> > > > > To: linux-kernel@vger.kernel.org
> > > > > Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W;
> > > > > Wyborny, Carolyn; Skidmore, Donald C; Rose, Gregory V;
> > > > > Waskiewicz Jr, Peter P; Duyck, Alexander H; Ronciak, John; Dave,
> > > > > Tushar N; Abodunrin, Akeem G; Vick, Matthew; e1000-
> > > > > devel@lists.sourceforge.net; netdev@vger.kernel.org;
> > > > > josh@joshtriplett.org
> > > > > Subject: [PATCH v2 1/9] drivers: net: Remove unused function
> > > > > igb_get_eee_status_i354() in e1000_82575.c
> > > > >
> > > > > This patch removes the function igb_get_eee_status_i354() in
> > > > > e1000_82575.c because it is unused.
> > > > >
> > > > > It thus eliminates the following warning in
> > > > > ethernet/intel/igb/e1000_82575.c:
> > > > > drivers/net/ethernet/intel/igb/e1000_82575.c:2591:5: warning: no
> > > > > previous prototype for ‘igb_get_eee_status_i354’
> > > > > [-Wmissing-prototypes]
> > > > >
> > > > > Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
> > > > > Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> > > > > ---
> > > > >  drivers/net/ethernet/intel/igb/e1000_82575.c |   32 ------------------------
> --
> > > > >  1 file changed, 32 deletions(-)
> > > > >
> > > > > diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > > b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > > index 47c2d10..18e5200 100644
> > > > > --- a/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > > +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
> > > > > @@ -2580,38 +2580,6 @@ out:
> > > > >  	return ret_val;
> > > > >  }
> > > > >
> > > > > -/**
> > > > > - *  igb_get_eee_status_i354 - Get EEE status
> > > > > - *  @hw: pointer to the HW structure
> > > > > - *  @status: EEE status
> > > > > - *
> > > > > - *  Get EEE status by guessing based on whether Tx or Rx LPI
> > > > > indications have
> > > > > - *  been received.
> > > > > - **/
> > > > > -s32 igb_get_eee_status_i354(struct e1000_hw *hw, bool *status) -{
> > > > > -	struct e1000_phy_info *phy = &hw->phy;
> > > > > -	s32 ret_val = 0;
> > > > > -	u16 phy_data;
> > > > > -
> > > > > -	/* Check if EEE is supported on this device. */
> > > > > -	if ((hw->phy.media_type != e1000_media_type_copper) ||
> > > > > -	    (phy->id != M88E1543_E_PHY_ID))
> > > > > -		goto out;
> > > > > -
> > > > > -	ret_val = igb_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
> > > > > -				     E1000_PCS_STATUS_DEV_I354,
> > > > > -				     &phy_data);
> > > > > -	if (ret_val)
> > > > > -		goto out;
> > > > > -
> > > > > -	*status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
> > > > > -			      E1000_PCS_STATUS_RX_LPI_RCVD) ? true : false;
> > > > > -
> > > > > -out:
> > > > > -	return ret_val;
> > > > > -}
> > > > > -
> > > > >  static const u8 e1000_emc_temp_data[4] = {
> > > > >  	E1000_EMC_INTERNAL_DATA,
> > > > >  	E1000_EMC_DIODE1_DATA,
> > > > > --
> > > > > 1.7.9.5
> > > >
> > > > NACK.
> > > >
> > > > Thanks for the patch Rashika, but this is the incorrect fix for
> > > > this warning  The function is called in the igb_probe function, so
> > > > you cannot remove it and I see the prototype in the e1000_82575.h file.
> > > > Can you double check your source pull?
> > >
> > > From top-of-tree linux.git:
> > >
> > > ~/src/linux$ git grep igb_get_eee_status_i354
> > > drivers/net/ethernet/intel/igb/e1000_82575.c: *
> > > igb_get_eee_status_i354 - Get EEE status
> > > drivers/net/ethernet/intel/igb/e1000_82575.c:s32jjj
> > > igb_get_eee_status_i354(struct e1000_hw *hw, bool *status)
> > >
> > > A comment and the function itself; no other references.  In what
> > > tree are you seeing a reference to igb_get_eee_status_i354?
> > >
> > > - Josh Triplett
> >
> > Thanks Josh,
> >
> > My mistake.  I was looking at the "get" not "set" function.  However, this is still
> not the right fix for the driver as the actual problem is the missing code that is
> supposed to be calling that function in igb_get_eee in igb_ethtool.c.  The
> function needs to stay.  I will submit the correct fix ASAP.
> 
> Ah, that makes sense.  Can you please Cc Rashika and myself on that patch, with
> a Reported-by for Rashika?
> 
> - Josh Triplett

Of course.  I'll add a Reported-by for you as well.

Thanks,

Carolyn