* [ PATCH net-next] qlcnic: fix sparse warnings
@ 2014-01-19 1:21 Stephen Hemminger
2014-01-19 7:09 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2014-01-19 1:21 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Fengguang Wu <fengguang.wu@intel.com>
Previous patch changed prototypes, but forgot functions.
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
qlcnic_83xx_hw.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c 2014-01-18 13:41:07.000000000 -0800
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c 2014-01-18 17:13:08.640658697 -0800
@@ -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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ PATCH net-next] qlcnic: fix sparse warnings
2014-01-19 1:21 [ PATCH net-next] qlcnic: fix sparse warnings Stephen Hemminger
@ 2014-01-19 7:09 ` David Miller
2014-01-19 19:37 ` [ PATCH net-next vw] " Stephen Hemminger
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2014-01-19 7:09 UTC (permalink / raw)
To: stephen; +Cc: netdev
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Sat, 18 Jan 2014 17:21:13 -0800
> From: Fengguang Wu <fengguang.wu@intel.com>
>
> Previous patch changed prototypes, but forgot functions.
>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
>
> ---
> qlcnic_83xx_hw.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c 2014-01-18 13:41:07.000000000 -0800
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c 2014-01-18 17:13:08.640658697 -0800
> @@ -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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ PATCH net-next vw] qlcnic: fix sparse warnings
2014-01-19 7:09 ` David Miller
@ 2014-01-19 19:37 ` Stephen Hemminger
2014-01-20 3:56 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Hemminger @ 2014-01-19 19:37 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Fengguang Wu <fengguang.wu@intel.com>
Subject: [PATCH net-next] qlcnic: fix sparse warnings
Previous patch changed prototypes, but forgot functions.
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
v2 - fix indentation
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c 2014-01-18 13:41:07.000000000 -0800
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c 2014-01-19 10:55:19.207423506 -0800
@@ -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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ PATCH net-next vw] qlcnic: fix sparse warnings
2014-01-19 19:37 ` [ PATCH net-next vw] " Stephen Hemminger
@ 2014-01-20 3:56 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-01-20 3:56 UTC (permalink / raw)
To: stephen; +Cc: netdev
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Sun, 19 Jan 2014 11:37:12 -0800
> From: Fengguang Wu <fengguang.wu@intel.com>
> Subject: [PATCH net-next] qlcnic: fix sparse warnings
>
> Previous patch changed prototypes, but forgot functions.
>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-20 3:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-19 1:21 [ PATCH net-next] qlcnic: fix sparse warnings Stephen Hemminger
2014-01-19 7:09 ` David Miller
2014-01-19 19:37 ` [ PATCH net-next vw] " Stephen Hemminger
2014-01-20 3:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).