Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32f75466 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: cleanup namespace complaint by removing little used function 



We had a support function that just walked a few pointers to get
from the ixgbe_hw struct to the netdev pointer.  This was causing
a namespace warning so I removed it and just reference the pointers
directly.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3b2ee943

drivers/net/ixgbe/ixgbe_common.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define _IXGBE_COMMON_H_

#define _IXGBE_COMMON_H_





#include "ixgbe_type.h"

#include "ixgbe_type.h"

#include "ixgbe.h"





u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);

u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);

s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);

s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
@@ -110,9 +111,8 @@ void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf); 




#define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)

#define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)





extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw);

#define hw_dbg(hw, format, arg...) \

#define hw_dbg(hw, format, arg...) \

	netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg)

	netdev_dbg(((struct ixgbe_adapter *)(hw->back))->netdev, format, ##arg)

#define e_dev_info(format, arg...) \

#define e_dev_info(format, arg...) \

	dev_info(&adapter->pdev->dev, format, ## arg)

	dev_info(&adapter->pdev->dev, format, ## arg)

#define e_dev_warn(format, arg...) \

#define e_dev_warn(format, arg...) \

drivers/net/ixgbe/ixgbe_main.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -7707,16 +7707,6 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event, 




#endif /* CONFIG_IXGBE_DCA */

#endif /* CONFIG_IXGBE_DCA */





/**

 * ixgbe_get_hw_dev return device

 * used by hardware layer to print debugging information

 **/

struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	return adapter->netdev;

}



module_exit(ixgbe_exit_module);

module_exit(ixgbe_exit_module);





/* ixgbe_main.c */
 
/* ixgbe_main.c */