| Message ID | 1539953291-189201-1-git-send-email-yuehaibing@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | [net-next] igc: Remove set but not used variable 'pci_using_dac' | expand |
On 10/19/2018 15:48, YueHaibing wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/net/ethernet/intel/igc/igc_main.c: In function 'igc_probe': > drivers/net/ethernet/intel/igc/igc_main.c:3535:11: warning: > variable 'pci_using_dac' set but not used [-Wunused-but-set-variable] > > It never used since introduction in commit > d89f88419f99 ("igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/net/ethernet/intel/igc/igc_main.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c > index 9d85707..06a4afbe 100644 > --- a/drivers/net/ethernet/intel/igc/igc_main.c > +++ b/drivers/net/ethernet/intel/igc/igc_main.c > @@ -3532,19 +3532,16 @@ static int igc_probe(struct pci_dev *pdev, > struct net_device *netdev; > struct igc_hw *hw; > const struct igc_info *ei = igc_info_tbl[ent->driver_data]; > - int err, pci_using_dac; > + int err; > > err = pci_enable_device_mem(pdev); > if (err) > return err; > > - pci_using_dac = 0; > err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); > if (!err) { > err = dma_set_coherent_mask(&pdev->dev, > DMA_BIT_MASK(64)); > - if (!err) > - pci_using_dac = 1; > } else { > err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); > if (err) { > Thanks for the patch. Good. Acked-by: Sasha Neftin <sasha.neftin@intel.com>
> From: netdev-owner@vger.kernel.org [mailto:netdev- > owner@vger.kernel.org] On Behalf Of YueHaibing > Sent: Friday, October 19, 2018 5:48 AM > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; David S. Miller > <davem@davemloft.net>; Neftin, Sasha <sasha.neftin@intel.com> > Cc: YueHaibing <yuehaibing@huawei.com>; intel-wired-lan@lists.osuosl.org; > netdev@vger.kernel.org; kernel-janitors@vger.kernel.org > Subject: [PATCH net-next] igc: Remove set but not used variable > 'pci_using_dac' > > Fixes gcc '-Wunused-but-set-variable' warning: > > drivers/net/ethernet/intel/igc/igc_main.c: In function 'igc_probe': > drivers/net/ethernet/intel/igc/igc_main.c:3535:11: warning: > variable 'pci_using_dac' set but not used [-Wunused-but-set-variable] > > It never used since introduction in commit > d89f88419f99 ("igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller > support") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/net/ethernet/intel/igc/igc_main.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > Tested-by: Aaron Brown <aaron.f.brown@intel.com>
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 9d85707..06a4afbe 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -3532,19 +3532,16 @@ static int igc_probe(struct pci_dev *pdev, struct net_device *netdev; struct igc_hw *hw; const struct igc_info *ei = igc_info_tbl[ent->driver_data]; - int err, pci_using_dac; + int err; err = pci_enable_device_mem(pdev); if (err) return err; - pci_using_dac = 0; err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); if (!err) { err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); - if (!err) - pci_using_dac = 1; } else { err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); if (err) {
Fixes gcc '-Wunused-but-set-variable' warning: drivers/net/ethernet/intel/igc/igc_main.c: In function 'igc_probe': drivers/net/ethernet/intel/igc/igc_main.c:3535:11: warning: variable 'pci_using_dac' set but not used [-Wunused-but-set-variable] It never used since introduction in commit d89f88419f99 ("igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/ethernet/intel/igc/igc_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)