net: aquantia: whitespace changes

Removed extra spaces, corrected alignment.

Signed-off-by: Nikita Danilov <nikita.danilov@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
index 22dd4fbd34d7894dd0bff21dbe09a814194b1450..6a633c70f603d7b70c3819b20f73d4b4f1405e64 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -98,8 +98,8 @@ static void aq_ethtool_stats(struct net_device *ndev,
        struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);
 
        memset(data, 0, (ARRAY_SIZE(aq_ethtool_stat_names) +
-                               ARRAY_SIZE(aq_ethtool_queue_stat_names) *
-                               cfg->vecs) * sizeof(u64));
+                        ARRAY_SIZE(aq_ethtool_queue_stat_names) *
+                        cfg->vecs) * sizeof(u64));
        aq_nic_get_stats(aq_nic, data);
 }
 

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 9809dbf8c2726d632a6038ed3a032494a3eef703..5fed244466871cd69b764ffdfcf55d92a9043763 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -189,7 +189,7 @@ static void aq_nic_polling_timer_cb(struct timer_list *t)
                aq_vec_isr(i, (void *)aq_vec);
 
        mod_timer(&self->polling_timer, jiffies +
-               AQ_CFG_POLLING_TIMER_INTERVAL);
+                 AQ_CFG_POLLING_TIMER_INTERVAL);
 }
 
 int aq_nic_ndev_register(struct aq_nic_s *self)
@@ -301,13 +301,13 @@ int aq_nic_start(struct aq_nic_s *self)
        unsigned int i = 0U;
 
        err = self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
-                                                   self->mc_list.ar,
-                                                   self->mc_list.count);
+                                                    self->mc_list.ar,
+                                                    self->mc_list.count);
        if (err < 0)
                goto err_exit;
 
        err = self->aq_hw_ops->hw_packet_filter_set(self->aq_hw,
-                                                  self->packet_filter);
+                                                   self->packet_filter);
        if (err < 0)
                goto err_exit;
 
@@ -327,7 +327,7 @@ int aq_nic_start(struct aq_nic_s *self)
                goto err_exit;
        timer_setup(&self->service_timer, aq_nic_service_timer_cb, 0);
        mod_timer(&self->service_timer, jiffies +
-                       AQ_CFG_SERVICE_TIMER_INTERVAL);
+                 AQ_CFG_SERVICE_TIMER_INTERVAL);
 
        if (self->aq_nic_cfg.is_polling) {
                timer_setup(&self->polling_timer, aq_nic_polling_timer_cb, 0);
@@ -344,7 +344,7 @@ int aq_nic_start(struct aq_nic_s *self)
                }
 
                err = self->aq_hw_ops->hw_irq_enable(self->aq_hw,
-                                   AQ_CFG_IRQ_MASK);
+                                                    AQ_CFG_IRQ_MASK);
                if (err < 0)
                        goto err_exit;
        }

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
index b5f1f62e8e253785436fa7cd9119a8467edf4fd4..32111272d7bf9bddd19bf8a60de4b70ffef2fedb 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
@@ -29,8 +29,8 @@ static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self,
                goto err_exit;
        }
        self->dx_ring = dma_alloc_coherent(aq_nic_get_dev(aq_nic),
-                                               self->size * self->dx_size,
-                                               &self->dx_ring_pa, GFP_KERNEL);
+                                          self->size * self->dx_size,
+                                          &self->dx_ring_pa, GFP_KERNEL);
        if (!self->dx_ring) {
                err = -ENOMEM;
                goto err_exit;

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
index 1dd0ef4a895c2f79f1d55a0054e5d7e2a533f4cf..d1d5bfda6a5b828a0516ed604003b40eeb92f2ab 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
@@ -49,9 +49,9 @@
 const struct aq_hw_caps_s hw_atl_a0_caps_aqc100 = {
        DEFAULT_A0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_FIBRE,
-       .link_speed_msk = HW_ATL_A0_RATE_5G  |
+       .link_speed_msk = HW_ATL_A0_RATE_5G |
                          HW_ATL_A0_RATE_2G5 |
-                         HW_ATL_A0_RATE_1G  |
+                         HW_ATL_A0_RATE_1G |
                          HW_ATL_A0_RATE_100M,
 };
 
@@ -59,9 +59,9 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc107 = {
        DEFAULT_A0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = HW_ATL_A0_RATE_10G |
-                         HW_ATL_A0_RATE_5G  |
+                         HW_ATL_A0_RATE_5G |
                          HW_ATL_A0_RATE_2G5 |
-                         HW_ATL_A0_RATE_1G  |
+                         HW_ATL_A0_RATE_1G |
                          HW_ATL_A0_RATE_100M,
 };
 
@@ -78,7 +78,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc109 = {
        DEFAULT_A0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = HW_ATL_A0_RATE_2G5 |
-                         HW_ATL_A0_RATE_1G  |
+                         HW_ATL_A0_RATE_1G |
                          HW_ATL_A0_RATE_100M,
 };
 
@@ -284,7 +284,7 @@ static int hw_atl_a0_hw_init_rx_path(struct aq_hw_s *self)
 
        /* RSS Ring selection */
        hw_atl_reg_rx_flr_rss_control1set(self, cfg->is_rss ?
-                                       0xB3333333U : 0x00000000U);
+                                         0xB3333333U : 0x00000000U);
 
        /* Multicast filters */
        for (i = HW_ATL_A0_MAC_MAX; i--;) {
@@ -325,7 +325,7 @@ static int hw_atl_a0_hw_mac_addr_set(struct aq_hw_s *self, u8 *mac_addr)
        }
        h = (mac_addr[0] << 8) | (mac_addr[1]);
        l = (mac_addr[2] << 24) | (mac_addr[3] << 16) |
-               (mac_addr[4] << 8) | mac_addr[5];
+           (mac_addr[4] << 8) | mac_addr[5];
 
        hw_atl_rpfl2_uc_flr_en_set(self, 0U, HW_ATL_A0_MAC);
        hw_atl_rpfl2unicast_dest_addresslsw_set(self, l, HW_ATL_A0_MAC);
@@ -519,7 +519,7 @@ static int hw_atl_a0_hw_ring_rx_init(struct aq_hw_s *self,
 
        hw_atl_rdm_rx_desc_data_buff_size_set(self,
                                              AQ_CFG_RX_FRAME_MAX / 1024U,
-                                      aq_ring->idx);
+                                             aq_ring->idx);
 
        hw_atl_rdm_rx_desc_head_buff_size_set(self, 0U, aq_ring->idx);
        hw_atl_rdm_rx_desc_head_splitting_set(self, 0U, aq_ring->idx);
@@ -758,7 +758,7 @@ static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,
                hw_atl_rpfl2_uc_flr_en_set(self,
                                           (self->aq_nic_cfg->is_mc_list_enabled &&
                                           (i <= self->aq_nic_cfg->mc_list_count)) ?
-                                           1U : 0U, i);
+                                          1U : 0U, i);
 
        return aq_hw_err_from_flags(self);
 }

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index d03f43683d8b60ca3033420ff341c6de2fa473ec..7c8ee103c825654c222171867c0ac70bca0ff1cd 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -52,9 +52,9 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc100 = {
        DEFAULT_B0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_FIBRE,
        .link_speed_msk = HW_ATL_B0_RATE_10G |
-                         HW_ATL_B0_RATE_5G  |
+                         HW_ATL_B0_RATE_5G |
                          HW_ATL_B0_RATE_2G5 |
-                         HW_ATL_B0_RATE_1G  |
+                         HW_ATL_B0_RATE_1G |
                          HW_ATL_B0_RATE_100M,
 };
 
@@ -62,18 +62,18 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc107 = {
        DEFAULT_B0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = HW_ATL_B0_RATE_10G |
-                         HW_ATL_B0_RATE_5G  |
+                         HW_ATL_B0_RATE_5G |
                          HW_ATL_B0_RATE_2G5 |
-                         HW_ATL_B0_RATE_1G  |
+                         HW_ATL_B0_RATE_1G |
                          HW_ATL_B0_RATE_100M,
 };
 
 const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = {
        DEFAULT_B0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
-       .link_speed_msk = HW_ATL_B0_RATE_5G  |
+       .link_speed_msk = HW_ATL_B0_RATE_5G |
                          HW_ATL_B0_RATE_2G5 |
-                         HW_ATL_B0_RATE_1G  |
+                         HW_ATL_B0_RATE_1G |
                          HW_ATL_B0_RATE_100M,
 };
 
@@ -81,7 +81,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc109 = {
        DEFAULT_B0_BOARD_BASIC_CAPABILITIES,
        .media_type = AQ_HW_MEDIA_TYPE_TP,
        .link_speed_msk = HW_ATL_B0_RATE_2G5 |
-                         HW_ATL_B0_RATE_1G  |
+                         HW_ATL_B0_RATE_1G |
                          HW_ATL_B0_RATE_100M,
 };
 

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
index bb1561c6d25a070fb7d049dda2b6601cb52dabd7..5b7116d015a4f45512608920aeea0dbf94191dde 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
@@ -49,6 +49,7 @@
 #define FORCE_FLASHLESS 0
 
 static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);
+
 static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,
                                      enum hal_atl_utils_fw_state_e state);
 
@@ -69,10 +70,10 @@ int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)
                                   self->fw_ver_actual) == 0) {
                *fw_ops = &aq_fw_1x_ops;
        } else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X,
-                                       self->fw_ver_actual) == 0) {
+                                         self->fw_ver_actual) == 0) {
                *fw_ops = &aq_fw_2x_ops;
        } else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X,
-                                       self->fw_ver_actual) == 0) {
+                                         self->fw_ver_actual) == 0) {
                *fw_ops = &aq_fw_2x_ops;
        } else {
                aq_pr_err("Bad FW version detected: %x\n",
@@ -260,7 +261,7 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)
 
                hw_atl_utils_mpi_set_state(self, MPI_DEINIT);
                AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) &
-                              HW_ATL_MPI_STATE_MSK) == MPI_DEINIT,
+                               HW_ATL_MPI_STATE_MSK) == MPI_DEINIT,
                               10, 1000U);
        }
 
@@ -277,7 +278,7 @@ int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a,
 
        AQ_HW_WAIT_FOR(hw_atl_reg_glb_cpu_sem_get(self,
                                                  HW_ATL_FW_SM_RAM) == 1U,
-                                                 1U, 10000U);
+                      1U, 10000U);
 
        if (err < 0) {
                bool is_locked;
@@ -393,7 +394,7 @@ static int hw_atl_utils_init_ucp(struct aq_hw_s *self,
 
        /* check 10 times by 1ms */
        AQ_HW_WAIT_FOR(0U != (self->mbox_addr =
-                       aq_hw_read_reg(self, 0x360U)), 1000U, 10U);
+                             aq_hw_read_reg(self, 0x360U)), 1000U, 10U);
 
        return err;
 }
@@ -425,7 +426,7 @@ int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size)
        err = hw_atl_utils_fw_upload_dwords(self, self->rpc_addr,
                                            (u32 *)(void *)&self->rpc,
                                            (rpc_size + sizeof(u32) -
-                                           sizeof(u8)) / sizeof(u32));
+                                            sizeof(u8)) / sizeof(u32));
        if (err < 0)
                goto err_exit;
 
@@ -450,7 +451,7 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,
                self->rpc_tid = sw.tid;
 
                AQ_HW_WAIT_FOR(sw.tid ==
-                               (fw.val =
+                              (fw.val =
                                aq_hw_read_reg(self, HW_ATL_RPC_STATE_ADR),
                                fw.tid), 1000U, 100U);
                if (err < 0)
@@ -473,7 +474,7 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,
                                                      (u32 *)(void *)
                                                      &self->rpc,
                                                      (fw.len + sizeof(u32) -
-                                                     sizeof(u8)) /
+                                                      sizeof(u8)) /
                                                      sizeof(u32));
                        if (err < 0)
                                goto err_exit;
@@ -506,9 +507,9 @@ int hw_atl_utils_mpi_read_mbox(struct aq_hw_s *self,
                               struct hw_aq_atl_utils_mbox_header *pmbox)
 {
        return hw_atl_utils_fw_downld_dwords(self,
-                                     self->mbox_addr,
-                                     (u32 *)(void *)pmbox,
-                                     sizeof(*pmbox) / sizeof(u32));
+                                            self->mbox_addr,
+                                            (u32 *)(void *)pmbox,
+                                            sizeof(*pmbox) / sizeof(u32));
 }
 
 void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,
@@ -561,8 +562,8 @@ static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,
                transaction_id = mbox.transaction_id;
 
                AQ_HW_WAIT_FOR(transaction_id !=
-                               (hw_atl_utils_mpi_read_mbox(self, &mbox),
-                                mbox.transaction_id),
+                              (hw_atl_utils_mpi_read_mbox(self, &mbox),
+                               mbox.transaction_id),
                               1000U, 100U);
                if (err < 0)
                        goto err_exit;
@@ -659,9 +660,9 @@ int hw_atl_utils_get_mac_permanent(struct aq_hw_s *self,
 
        if ((mac[0] & 0x01U) || ((mac[0] | mac[1] | mac[2]) == 0x00U)) {
                /* chip revision */
-               l = 0xE3000000U
-                       | (0xFFFFU & aq_hw_read_reg(self, HW_ATL_UCP_0X370_REG))
-                       | (0x00 << 16);
+               l = 0xE3000000U |
+                   (0xFFFFU & aq_hw_read_reg(self, HW_ATL_UCP_0X370_REG)) |
+                   (0x00 << 16);
                h = 0x8001300EU;
 
                mac[5] = (u8)(0xFFU & l);

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
index 6ced102d02dbebae2cc1cd8ec2f1584c020a1582..f3d830f423f2d61551a33350c987e202fce98cfc 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
@@ -416,6 +416,7 @@ int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version);
 int hw_atl_utils_update_stats(struct aq_hw_s *self);
 
 struct aq_stats_s *hw_atl_utils_get_hw_stats(struct aq_hw_s *self);
+
 int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a,
                                  u32 *p, u32 cnt);
 

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
index 27bed5dd52953ab98a1b9d4abc5634a9ebacf3b4..7410e28e5a1fd16d67f17e22a1212f73dc5b3598 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
@@ -76,7 +76,7 @@ static int aq_fw2x_init(struct aq_hw_s *self)
 
        /* check 10 times by 1ms */
        AQ_HW_WAIT_FOR(0U != (self->mbox_addr =
-                       aq_hw_read_reg(self, HW_ATL_FW2X_MPI_MBOX_ADDR)),
+                      aq_hw_read_reg(self, HW_ATL_FW2X_MPI_MBOX_ADDR)),
                       1000U, 10U);
        AQ_HW_WAIT_FOR(0U != (self->rpc_addr =
                       aq_hw_read_reg(self, HW_ATL_FW2X_MPI_RPC_ADDR)),
@@ -213,7 +213,7 @@ static int aq_fw2x_update_link_status(struct aq_hw_s *self)
 {
        u32 mpi_state = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR);
        u32 speed = mpi_state & (FW2X_RATE_100M | FW2X_RATE_1G |
-                               FW2X_RATE_2G5 | FW2X_RATE_5G | FW2X_RATE_10G);
+                                FW2X_RATE_2G5 | FW2X_RATE_5G | FW2X_RATE_10G);
        struct aq_hw_link_status_s *link_status = &self->aq_link_status;
 
        if (speed) {
@@ -262,9 +262,7 @@ static int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac)
 
                get_random_bytes(&rnd, sizeof(unsigned int));
 
-               l = 0xE3000000U
-                       | (0xFFFFU & rnd)
-                       | (0x00 << 16);
+               l = 0xE3000000U | (0xFFFFU & rnd) | (0x00 << 16);
                h = 0x8001300EU;
 
                mac[5] = (u8)(0xFFU & l);
@@ -294,7 +292,7 @@ int aq_fw2x_update_stats(struct aq_hw_s *self)
        /* Wait FW to report back */
        AQ_HW_WAIT_FOR(orig_stats_val !=
                       (aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE2_ADDR) &
-                                      BIT(CAPS_HI_STATISTICS)),
+                       BIT(CAPS_HI_STATISTICS)),
                       1U, 10000U);
        if (err)
                return err;
@@ -466,5 +464,5 @@ const struct aq_fw_ops aq_fw_2x_ops = {
        .set_power = aq_fw2x_set_power,
        .set_eee_rate = aq_fw2x_set_eee_rate,
        .get_eee_rate = aq_fw2x_get_eee_rate,
-       .set_flow_control   = aq_fw2x_set_flow_control,
+       .set_flow_control = aq_fw2x_set_flow_control,
 };