aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2014-05-09 03:59:15 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-09 13:13:39 -0400
commit05e4c6a3af71dd3848f3f54a1ccb740bdcd183e2 (patch)
treec683ef246ed884c214ce2fd78642a8269789b993
parenta2cc4e0b93bd209b5284807864af48800cb40023 (diff)
be2net: fix line wrap and function call indentation in be_ethtool.c
When a funtion definition or a function call spans more than one line, ensure that the first argument on the subsequent lines is aligned to the first column after the opening paranthesis of the function call. Also removes unnecessary line wrap. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c100
1 files changed, 42 insertions, 58 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 6f3494e41511..cffbb130999a 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -181,7 +181,7 @@ static const char et_self_tests[][ETH_GSTRING_LEN] = {
181#define BE_NO_LOOPBACK 0xff 181#define BE_NO_LOOPBACK 0xff
182 182
183static void be_get_drvinfo(struct net_device *netdev, 183static void be_get_drvinfo(struct net_device *netdev,
184 struct ethtool_drvinfo *drvinfo) 184 struct ethtool_drvinfo *drvinfo)
185{ 185{
186 struct be_adapter *adapter = netdev_priv(netdev); 186 struct be_adapter *adapter = netdev_priv(netdev);
187 187
@@ -201,8 +201,7 @@ static void be_get_drvinfo(struct net_device *netdev,
201 drvinfo->eedump_len = 0; 201 drvinfo->eedump_len = 0;
202} 202}
203 203
204static u32 204static u32 lancer_cmd_get_file_len(struct be_adapter *adapter, u8 *file_name)
205lancer_cmd_get_file_len(struct be_adapter *adapter, u8 *file_name)
206{ 205{
207 u32 data_read = 0, eof; 206 u32 data_read = 0, eof;
208 u8 addn_status; 207 u8 addn_status;
@@ -212,14 +211,14 @@ lancer_cmd_get_file_len(struct be_adapter *adapter, u8 *file_name)
212 memset(&data_len_cmd, 0, sizeof(data_len_cmd)); 211 memset(&data_len_cmd, 0, sizeof(data_len_cmd));
213 /* data_offset and data_size should be 0 to get reg len */ 212 /* data_offset and data_size should be 0 to get reg len */
214 status = lancer_cmd_read_object(adapter, &data_len_cmd, 0, 0, 213 status = lancer_cmd_read_object(adapter, &data_len_cmd, 0, 0,
215 file_name, &data_read, &eof, &addn_status); 214 file_name, &data_read, &eof,
215 &addn_status);
216 216
217 return data_read; 217 return data_read;
218} 218}
219 219
220static int 220static int lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
221lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name, 221 u32 buf_len, void *buf)
222 u32 buf_len, void *buf)
223{ 222{
224 struct be_dma_mem read_cmd; 223 struct be_dma_mem read_cmd;
225 u32 read_len = 0, total_read_len = 0, chunk_size; 224 u32 read_len = 0, total_read_len = 0, chunk_size;
@@ -229,11 +228,11 @@ lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
229 228
230 read_cmd.size = LANCER_READ_FILE_CHUNK; 229 read_cmd.size = LANCER_READ_FILE_CHUNK;
231 read_cmd.va = pci_alloc_consistent(adapter->pdev, read_cmd.size, 230 read_cmd.va = pci_alloc_consistent(adapter->pdev, read_cmd.size,
232 &read_cmd.dma); 231 &read_cmd.dma);
233 232
234 if (!read_cmd.va) { 233 if (!read_cmd.va) {
235 dev_err(&adapter->pdev->dev, 234 dev_err(&adapter->pdev->dev,
236 "Memory allocation failure while reading dump\n"); 235 "Memory allocation failure while reading dump\n");
237 return -ENOMEM; 236 return -ENOMEM;
238 } 237 }
239 238
@@ -242,8 +241,8 @@ lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
242 LANCER_READ_FILE_CHUNK); 241 LANCER_READ_FILE_CHUNK);
243 chunk_size = ALIGN(chunk_size, 4); 242 chunk_size = ALIGN(chunk_size, 4);
244 status = lancer_cmd_read_object(adapter, &read_cmd, chunk_size, 243 status = lancer_cmd_read_object(adapter, &read_cmd, chunk_size,
245 total_read_len, file_name, &read_len, 244 total_read_len, file_name,
246 &eof, &addn_status); 245 &read_len, &eof, &addn_status);
247 if (!status) { 246 if (!status) {
248 memcpy(buf + total_read_len, read_cmd.va, read_len); 247 memcpy(buf + total_read_len, read_cmd.va, read_len);
249 total_read_len += read_len; 248 total_read_len += read_len;
@@ -254,13 +253,12 @@ lancer_cmd_read_file(struct be_adapter *adapter, u8 *file_name,
254 } 253 }
255 } 254 }
256 pci_free_consistent(adapter->pdev, read_cmd.size, read_cmd.va, 255 pci_free_consistent(adapter->pdev, read_cmd.size, read_cmd.va,
257 read_cmd.dma); 256 read_cmd.dma);
258 257
259 return status; 258 return status;
260} 259}
261 260
262static int 261static int be_get_reg_len(struct net_device *netdev)
263be_get_reg_len(struct net_device *netdev)
264{ 262{
265 struct be_adapter *adapter = netdev_priv(netdev); 263 struct be_adapter *adapter = netdev_priv(netdev);
266 u32 log_size = 0; 264 u32 log_size = 0;
@@ -271,7 +269,7 @@ be_get_reg_len(struct net_device *netdev)
271 if (be_physfn(adapter)) { 269 if (be_physfn(adapter)) {
272 if (lancer_chip(adapter)) 270 if (lancer_chip(adapter))
273 log_size = lancer_cmd_get_file_len(adapter, 271 log_size = lancer_cmd_get_file_len(adapter,
274 LANCER_FW_DUMP_FILE); 272 LANCER_FW_DUMP_FILE);
275 else 273 else
276 be_cmd_get_reg_len(adapter, &log_size); 274 be_cmd_get_reg_len(adapter, &log_size);
277 } 275 }
@@ -287,7 +285,7 @@ be_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *buf)
287 memset(buf, 0, regs->len); 285 memset(buf, 0, regs->len);
288 if (lancer_chip(adapter)) 286 if (lancer_chip(adapter))
289 lancer_cmd_read_file(adapter, LANCER_FW_DUMP_FILE, 287 lancer_cmd_read_file(adapter, LANCER_FW_DUMP_FILE,
290 regs->len, buf); 288 regs->len, buf);
291 else 289 else
292 be_cmd_get_regs(adapter, regs->len, buf); 290 be_cmd_get_regs(adapter, regs->len, buf);
293 } 291 }
@@ -337,9 +335,8 @@ static int be_set_coalesce(struct net_device *netdev,
337 return 0; 335 return 0;
338} 336}
339 337
340static void 338static void be_get_ethtool_stats(struct net_device *netdev,
341be_get_ethtool_stats(struct net_device *netdev, 339 struct ethtool_stats *stats, uint64_t *data)
342 struct ethtool_stats *stats, uint64_t *data)
343{ 340{
344 struct be_adapter *adapter = netdev_priv(netdev); 341 struct be_adapter *adapter = netdev_priv(netdev);
345 struct be_rx_obj *rxo; 342 struct be_rx_obj *rxo;
@@ -390,9 +387,8 @@ be_get_ethtool_stats(struct net_device *netdev,
390 } 387 }
391} 388}
392 389
393static void 390static void be_get_stat_strings(struct net_device *netdev, uint32_t stringset,
394be_get_stat_strings(struct net_device *netdev, uint32_t stringset, 391 uint8_t *data)
395 uint8_t *data)
396{ 392{
397 struct be_adapter *adapter = netdev_priv(netdev); 393 struct be_adapter *adapter = netdev_priv(netdev);
398 int i, j; 394 int i, j;
@@ -642,16 +638,15 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd)
642 adapter->rx_fc = ecmd->rx_pause; 638 adapter->rx_fc = ecmd->rx_pause;
643 639
644 status = be_cmd_set_flow_control(adapter, 640 status = be_cmd_set_flow_control(adapter,
645 adapter->tx_fc, adapter->rx_fc); 641 adapter->tx_fc, adapter->rx_fc);
646 if (status) 642 if (status)
647 dev_warn(&adapter->pdev->dev, "Pause param set failed.\n"); 643 dev_warn(&adapter->pdev->dev, "Pause param set failed.\n");
648 644
649 return status; 645 return status;
650} 646}
651 647
652static int 648static int be_set_phys_id(struct net_device *netdev,
653be_set_phys_id(struct net_device *netdev, 649 enum ethtool_phys_id_state state)
654 enum ethtool_phys_id_state state)
655{ 650{
656 struct be_adapter *adapter = netdev_priv(netdev); 651 struct be_adapter *adapter = netdev_priv(netdev);
657 652
@@ -708,8 +703,7 @@ static int be_set_dump(struct net_device *netdev, struct ethtool_dump *dump)
708 return status; 703 return status;
709} 704}
710 705
711static void 706static void be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
712be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
713{ 707{
714 struct be_adapter *adapter = netdev_priv(netdev); 708 struct be_adapter *adapter = netdev_priv(netdev);
715 709
@@ -723,8 +717,7 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
723 memset(&wol->sopass, 0, sizeof(wol->sopass)); 717 memset(&wol->sopass, 0, sizeof(wol->sopass));
724} 718}
725 719
726static int 720static int be_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
727be_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
728{ 721{
729 struct be_adapter *adapter = netdev_priv(netdev); 722 struct be_adapter *adapter = netdev_priv(netdev);
730 723
@@ -744,8 +737,7 @@ be_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
744 return 0; 737 return 0;
745} 738}
746 739
747static int 740static int be_test_ddr_dma(struct be_adapter *adapter)
748be_test_ddr_dma(struct be_adapter *adapter)
749{ 741{
750 int ret, i; 742 int ret, i;
751 struct be_dma_mem ddrdma_cmd; 743 struct be_dma_mem ddrdma_cmd;
@@ -761,7 +753,7 @@ be_test_ddr_dma(struct be_adapter *adapter)
761 753
762 for (i = 0; i < 2; i++) { 754 for (i = 0; i < 2; i++) {
763 ret = be_cmd_ddr_dma_test(adapter, pattern[i], 755 ret = be_cmd_ddr_dma_test(adapter, pattern[i],
764 4096, &ddrdma_cmd); 756 4096, &ddrdma_cmd);
765 if (ret != 0) 757 if (ret != 0)
766 goto err; 758 goto err;
767 } 759 }
@@ -773,20 +765,17 @@ err:
773} 765}
774 766
775static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type, 767static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type,
776 u64 *status) 768 u64 *status)
777{ 769{
778 be_cmd_set_loopback(adapter, adapter->hba_port_num, 770 be_cmd_set_loopback(adapter, adapter->hba_port_num, loopback_type, 1);
779 loopback_type, 1);
780 *status = be_cmd_loopback_test(adapter, adapter->hba_port_num, 771 *status = be_cmd_loopback_test(adapter, adapter->hba_port_num,
781 loopback_type, 1500, 772 loopback_type, 1500, 2, 0xabc);
782 2, 0xabc); 773 be_cmd_set_loopback(adapter, adapter->hba_port_num, BE_NO_LOOPBACK, 1);
783 be_cmd_set_loopback(adapter, adapter->hba_port_num,
784 BE_NO_LOOPBACK, 1);
785 return *status; 774 return *status;
786} 775}
787 776
788static void 777static void be_self_test(struct net_device *netdev, struct ethtool_test *test,
789be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) 778 u64 *data)
790{ 779{
791 struct be_adapter *adapter = netdev_priv(netdev); 780 struct be_adapter *adapter = netdev_priv(netdev);
792 int status; 781 int status;
@@ -801,12 +790,10 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
801 memset(data, 0, sizeof(u64) * ETHTOOL_TESTS_NUM); 790 memset(data, 0, sizeof(u64) * ETHTOOL_TESTS_NUM);
802 791
803 if (test->flags & ETH_TEST_FL_OFFLINE) { 792 if (test->flags & ETH_TEST_FL_OFFLINE) {
804 if (be_loopback_test(adapter, BE_MAC_LOOPBACK, 793 if (be_loopback_test(adapter, BE_MAC_LOOPBACK, &data[0]) != 0)
805 &data[0]) != 0)
806 test->flags |= ETH_TEST_FL_FAILED; 794 test->flags |= ETH_TEST_FL_FAILED;
807 795
808 if (be_loopback_test(adapter, BE_PHY_LOOPBACK, 796 if (be_loopback_test(adapter, BE_PHY_LOOPBACK, &data[1]) != 0)
809 &data[1]) != 0)
810 test->flags |= ETH_TEST_FL_FAILED; 797 test->flags |= ETH_TEST_FL_FAILED;
811 798
812 if (test->flags & ETH_TEST_FL_EXTERNAL_LB) { 799 if (test->flags & ETH_TEST_FL_EXTERNAL_LB) {
@@ -832,16 +819,14 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
832 } 819 }
833} 820}
834 821
835static int 822static int be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
836be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
837{ 823{
838 struct be_adapter *adapter = netdev_priv(netdev); 824 struct be_adapter *adapter = netdev_priv(netdev);
839 825
840 return be_load_fw(adapter, efl->data); 826 return be_load_fw(adapter, efl->data);
841} 827}
842 828
843static int 829static int be_get_eeprom_len(struct net_device *netdev)
844be_get_eeprom_len(struct net_device *netdev)
845{ 830{
846 struct be_adapter *adapter = netdev_priv(netdev); 831 struct be_adapter *adapter = netdev_priv(netdev);
847 832
@@ -851,18 +836,17 @@ be_get_eeprom_len(struct net_device *netdev)
851 if (lancer_chip(adapter)) { 836 if (lancer_chip(adapter)) {
852 if (be_physfn(adapter)) 837 if (be_physfn(adapter))
853 return lancer_cmd_get_file_len(adapter, 838 return lancer_cmd_get_file_len(adapter,
854 LANCER_VPD_PF_FILE); 839 LANCER_VPD_PF_FILE);
855 else 840 else
856 return lancer_cmd_get_file_len(adapter, 841 return lancer_cmd_get_file_len(adapter,
857 LANCER_VPD_VF_FILE); 842 LANCER_VPD_VF_FILE);
858 } else { 843 } else {
859 return BE_READ_SEEPROM_LEN; 844 return BE_READ_SEEPROM_LEN;
860 } 845 }
861} 846}
862 847
863static int 848static int be_read_eeprom(struct net_device *netdev,
864be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom, 849 struct ethtool_eeprom *eeprom, uint8_t *data)
865 uint8_t *data)
866{ 850{
867 struct be_adapter *adapter = netdev_priv(netdev); 851 struct be_adapter *adapter = netdev_priv(netdev);
868 struct be_dma_mem eeprom_cmd; 852 struct be_dma_mem eeprom_cmd;
@@ -875,10 +859,10 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
875 if (lancer_chip(adapter)) { 859 if (lancer_chip(adapter)) {
876 if (be_physfn(adapter)) 860 if (be_physfn(adapter))
877 return lancer_cmd_read_file(adapter, LANCER_VPD_PF_FILE, 861 return lancer_cmd_read_file(adapter, LANCER_VPD_PF_FILE,
878 eeprom->len, data); 862 eeprom->len, data);
879 else 863 else
880 return lancer_cmd_read_file(adapter, LANCER_VPD_VF_FILE, 864 return lancer_cmd_read_file(adapter, LANCER_VPD_VF_FILE,
881 eeprom->len, data); 865 eeprom->len, data);
882 } 866 }
883 867
884 eeprom->magic = BE_VENDOR_ID | (adapter->pdev->device<<16); 868 eeprom->magic = BE_VENDOR_ID | (adapter->pdev->device<<16);
@@ -962,7 +946,7 @@ static u64 be_get_rss_hash_opts(struct be_adapter *adapter, u64 flow_type)
962} 946}
963 947
964static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 948static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
965 u32 *rule_locs) 949 u32 *rule_locs)
966{ 950{
967 struct be_adapter *adapter = netdev_priv(netdev); 951 struct be_adapter *adapter = netdev_priv(netdev);
968 952