Skip to contentSkip to conversation

qlcnic: fix sparse warnings

PATCH In review Stephen Hemminger 2 participants 4 messages Jan 19, 2014 – Jan 20, 2014

Subsystems (3)
Networking Network drivers QLogic qlcnic (1/10)Gb Ethernet driver
lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

PATCH 1/1 qlcnic: fix sparse warnings

From: Fengguang Wu <[email protected]>

Previous patch changed prototypes, but forgot functions.

Signed-off-by Fengguang Wu <[email protected]>
Acked-by Stephen Hemminger <[email protected]>
---
 qlcnic_83xx_hw.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +6 -6
@@ -2066,7 +2066,7 @@ void qlcnic_83xx_change_l2_filter(struct
 	qlcnic_83xx_sre_macaddr_change(adapter, mac, vlan_id, QLCNIC_MAC_ADD);
 }
 
-void qlcnic_83xx_configure_mac(struct qlcnic_adapter *adapter, u8 *mac,
+static void qlcnic_83xx_configure_mac(struct qlcnic_adapter *adapter, u8 *mac,
 			       u8 type, struct qlcnic_cmd_args *cmd)
 {
 	switch (type) {

@@ -2170,7 +2170,7 @@ static void qlcnic_83xx_handle_link_aen(
 	qlcnic_advert_link_change(adapter, link_status);
 }
 
-irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data)
+static irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data)
 {
 	struct qlcnic_adapter *adapter = data;
 	struct qlcnic_mailbox *mbx;

@@ -3517,7 +3517,7 @@ int qlcnic_83xx_flash_test(struct qlcnic
 	return 0;
 }
 
-int qlcnic_83xx_shutdown(struct pci_dev *pdev)
+static int qlcnic_83xx_shutdown(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
 	struct net_device *netdev = adapter->netdev;

@@ -3892,7 +3892,7 @@ int qlcnic_83xx_init_mailbox_work(struct
 	return 0;
 }
 
-pci_ers_result_t qlcnic_83xx_io_error_detected(struct pci_dev *pdev,
+static pci_ers_result_t qlcnic_83xx_io_error_detected(struct pci_dev *pdev,
 					       pci_channel_state_t state)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);

@@ -3914,7 +3914,7 @@ pci_ers_result_t qlcnic_83xx_io_error_de
 	return PCI_ERS_RESULT_NEED_RESET;
 }
 
-pci_ers_result_t qlcnic_83xx_io_slot_reset(struct pci_dev *pdev)
+static pci_ers_result_t qlcnic_83xx_io_slot_reset(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
 	int err = 0;

@@ -3937,7 +3937,7 @@ disconnect:
 	return PCI_ERS_RESULT_DISCONNECT;
 }
 
-void qlcnic_83xx_io_resume(struct pci_dev *pdev)
+static void qlcnic_83xx_io_resume(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
maintainer
#1 lore raw

From: Stephen Hemminger <[email protected]>
Date: Sat, 18 Jan 2014 17:21:13 -0800

Quoted 14 lines

From: Fengguang Wu <[email protected]>

Previous patch changed prototypes, but forgot functions.

Signed-off-by Fengguang Wu <[email protected]>
Acked-by Stephen Hemminger <[email protected]>
---
 qlcnic_83xx_hw.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c void qlcnic_83xx_change_l2_filter(struct · line 2070

Quoted 6 lines
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +1 -1
@@ -2066,7 +2066,7 @@ void qlcnic_83xx_change_l2_filter(struct
 	qlcnic_83xx_sre_macaddr_change(adapter, mac, vlan_id, QLCNIC_MAC_ADD);
 }
 
-void qlcnic_83xx_configure_mac(struct qlcnic_adapter *adapter, u8 *mac,
+static void qlcnic_83xx_configure_mac(struct qlcnic_adapter *adapter, u8 *mac,
 			       u8 type, struct qlcnic_cmd_args *cmd)

Please adjust argument indentation, this goes for the whole patch.

Thanks.

author
#2 lore raw

PATCH 1/1 qlcnic: fix sparse warnings

From: Fengguang Wu <[email protected]>
Subject: [PATCH net-next] qlcnic: fix sparse warnings

Previous patch changed prototypes, but forgot functions.

Signed-off-by Fengguang Wu <[email protected]>
Acked-by Stephen Hemminger <[email protected]>

---
v2 - fix indentation

 drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +8 -8
@@ -2066,8 +2066,8 @@ void qlcnic_83xx_change_l2_filter(struct
 	qlcnic_83xx_sre_macaddr_change(adapter, mac, vlan_id, QLCNIC_MAC_ADD);
 }
 
-void qlcnic_83xx_configure_mac(struct qlcnic_adapter *adapter, u8 *mac,
-			       u8 type, struct qlcnic_cmd_args *cmd)
+static void qlcnic_83xx_configure_mac(struct qlcnic_adapter *adapter, u8 *mac,
+				      u8 type, struct qlcnic_cmd_args *cmd)
 {
 	switch (type) {
 	case QLCNIC_SET_STATION_MAC:

@@ -2170,7 +2170,7 @@ static void qlcnic_83xx_handle_link_aen(
 	qlcnic_advert_link_change(adapter, link_status);
 }
 
-irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data)
+static irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data)
 {
 	struct qlcnic_adapter *adapter = data;
 	struct qlcnic_mailbox *mbx;

@@ -3517,7 +3517,7 @@ int qlcnic_83xx_flash_test(struct qlcnic
 	return 0;
 }
 
-int qlcnic_83xx_shutdown(struct pci_dev *pdev)
+static int qlcnic_83xx_shutdown(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
 	struct net_device *netdev = adapter->netdev;

@@ -3892,8 +3892,8 @@ int qlcnic_83xx_init_mailbox_work(struct
 	return 0;
 }
 
-pci_ers_result_t qlcnic_83xx_io_error_detected(struct pci_dev *pdev,
-					       pci_channel_state_t state)
+static pci_ers_result_t qlcnic_83xx_io_error_detected(struct pci_dev *pdev,
+						      pci_channel_state_t state)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
 

@@ -3914,7 +3914,7 @@ pci_ers_result_t qlcnic_83xx_io_error_de
 	return PCI_ERS_RESULT_NEED_RESET;
 }
 
-pci_ers_result_t qlcnic_83xx_io_slot_reset(struct pci_dev *pdev)
+static pci_ers_result_t qlcnic_83xx_io_slot_reset(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
 	int err = 0;

@@ -3937,7 +3937,7 @@ disconnect:
 	return PCI_ERS_RESULT_DISCONNECT;
 }
 
-void qlcnic_83xx_io_resume(struct pci_dev *pdev)
+static void qlcnic_83xx_io_resume(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);