Commit 78f5193d authored by Igor Russkikh's avatar Igor Russkikh Committed by David S. Miller
Browse files

net: aquantia: Cleanup status flags accesses 



Usage of aq_obj_s structure is noop, here we remove it
replacing access to flags filed directly.

Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08b5cf08

drivers/net/ethernet/aquantia/atlantic/aq_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct aq_stats_s { 
#define AQ_HW_FLAG_ERRORS      (AQ_HW_FLAG_ERR_HW | AQ_HW_FLAG_ERR_UNPLUG)



struct aq_hw_s {

	struct aq_obj_s header;

	atomic_t flags;

	struct aq_nic_cfg_s *aq_nic_cfg;

	struct aq_pci_func_s *aq_pci_func;

	void __iomem *mmio;

drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ u32 aq_hw_read_reg(struct aq_hw_s *hw, u32 reg) 
	u32 value = readl(hw->mmio + reg);



	if ((~0U) == value && (~0U) == readl(hw->mmio + hw->not_ff_addr))

		aq_utils_obj_set(&hw->header.flags, AQ_HW_FLAG_ERR_UNPLUG);

		aq_utils_obj_set(&hw->flags, AQ_HW_FLAG_ERR_UNPLUG);



	return value;

}
@@ -54,11 +54,11 @@ int aq_hw_err_from_flags(struct aq_hw_s *hw) 
{

	int err = 0;



	if (aq_utils_obj_test(&hw->header.flags, AQ_HW_FLAG_ERR_UNPLUG)) {

	if (aq_utils_obj_test(&hw->flags, AQ_HW_FLAG_ERR_UNPLUG)) {

		err = -ENXIO;

		goto err_exit;

	}

	if (aq_utils_obj_test(&hw->header.flags, AQ_HW_FLAG_ERR_HW)) {

	if (aq_utils_obj_test(&hw->flags, AQ_HW_FLAG_ERR_HW)) {

		err = -EIO;

		goto err_exit;

	}

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+4 −4
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ static int aq_nic_update_link_status(struct aq_nic_s *self) 


	self->link_status = self->aq_hw->aq_link_status;

	if (!netif_carrier_ok(self->ndev) && self->link_status.mbps) {

		aq_utils_obj_set(&self->header.flags,

		aq_utils_obj_set(&self->flags,

				 AQ_NIC_FLAG_STARTED);

		aq_utils_obj_clear(&self->header.flags,

		aq_utils_obj_clear(&self->flags,

				   AQ_NIC_LINK_DOWN);

		netif_carrier_on(self->ndev);

		netif_tx_wake_all_queues(self->ndev);
@@ -160,7 +160,7 @@ static int aq_nic_update_link_status(struct aq_nic_s *self) 
	if (netif_carrier_ok(self->ndev) && !self->link_status.mbps) {

		netif_carrier_off(self->ndev);

		netif_tx_disable(self->ndev);

		aq_utils_obj_set(&self->header.flags, AQ_NIC_LINK_DOWN);

		aq_utils_obj_set(&self->flags, AQ_NIC_LINK_DOWN);

	}

	return 0;

}
@@ -171,7 +171,7 @@ static void aq_nic_service_timer_cb(struct timer_list *t) 
	int ctimer = AQ_CFG_SERVICE_TIMER_INTERVAL;

	int err = 0;



	if (aq_utils_obj_test(&self->header.flags, AQ_NIC_FLAGS_IS_NOT_READY))

	if (aq_utils_obj_test(&self->flags, AQ_NIC_FLAGS_IS_NOT_READY))

		goto err_exit;



	err = aq_nic_update_link_status(self);

drivers/net/ethernet/aquantia/atlantic/aq_nic_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define AQ_NIC_INTERNAL_H



struct aq_nic_s {

	struct aq_obj_s header;

	atomic_t flags;

	struct aq_vec_s *aq_vec[AQ_CFG_VECS_MAX];

	struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX * AQ_CFG_TCS_MAX];

	struct aq_hw_s *aq_hw;

drivers/net/ethernet/aquantia/atlantic/aq_ring.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ union aq_ring_stats_s { 
};



struct aq_ring_s {

	struct aq_obj_s header;

	struct aq_ring_buff_s *buff_ring;

	u8 *dx_ring;		/* descriptors ring, dma shared mem */

	struct aq_nic_s *aq_nic;