tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'Cosmetic-cleanup-in-SJA1105-DSA-driver'
Vladimir Oltean says:
====================
Cosmetic cleanup in SJA1105 DSA driver
This removes the sparse warnings from the sja1105 driver and makes some
structures constant.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
+33
-73
+6
-6
drivers/net/dsa/sja1105/sja1105.h
+6
-6
drivers/net/dsa/sja1105/sja1105.h
···
262
262
int sja1105_inhibit_tx(const struct sja1105_private *priv,
263
263
unsigned long port_bitmap, bool tx_inhibited);
264
264
265
-
extern struct sja1105_info sja1105e_info;
266
-
extern struct sja1105_info sja1105t_info;
267
-
extern struct sja1105_info sja1105p_info;
268
-
extern struct sja1105_info sja1105q_info;
269
-
extern struct sja1105_info sja1105r_info;
270
-
extern struct sja1105_info sja1105s_info;
265
+
extern const struct sja1105_info sja1105e_info;
266
+
extern const struct sja1105_info sja1105t_info;
267
+
extern const struct sja1105_info sja1105p_info;
268
+
extern const struct sja1105_info sja1105q_info;
269
+
extern const struct sja1105_info sja1105r_info;
270
+
extern const struct sja1105_info sja1105s_info;
271
271
272
272
/* From sja1105_clocking.c */
273
273
+2
-23
drivers/net/dsa/sja1105/sja1105_dynamic_config.c
+2
-23
drivers/net/dsa/sja1105/sja1105_dynamic_config.c
···
638
638
#define OP_SEARCH BIT(3)
639
639
640
640
/* SJA1105E/T: First generation */
641
-
struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {
642
-
[BLK_IDX_SCHEDULE] = {0},
643
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {0},
641
+
const struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {
644
642
[BLK_IDX_VL_LOOKUP] = {
645
643
.entry_packing = sja1105et_vl_lookup_entry_packing,
646
644
.cmd_packing = sja1105_vl_lookup_cmd_packing,
···
647
649
.packed_size = SJA1105ET_SJA1105_SIZE_VL_LOOKUP_DYN_CMD,
648
650
.addr = 0x35,
649
651
},
650
-
[BLK_IDX_VL_POLICING] = {0},
651
-
[BLK_IDX_VL_FORWARDING] = {0},
652
652
[BLK_IDX_L2_LOOKUP] = {
653
653
.entry_packing = sja1105et_dyn_l2_lookup_entry_packing,
654
654
.cmd_packing = sja1105et_l2_lookup_cmd_packing,
···
663
667
.packed_size = SJA1105ET_SIZE_L2_LOOKUP_DYN_CMD,
664
668
.addr = 0x20,
665
669
},
666
-
[BLK_IDX_L2_POLICING] = {0},
667
670
[BLK_IDX_VLAN_LOOKUP] = {
668
671
.entry_packing = sja1105_vlan_lookup_entry_packing,
669
672
.cmd_packing = sja1105_vlan_lookup_cmd_packing,
···
687
692
.packed_size = SJA1105ET_SIZE_MAC_CONFIG_DYN_CMD,
688
693
.addr = 0x36,
689
694
},
690
-
[BLK_IDX_SCHEDULE_PARAMS] = {0},
691
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {0},
692
-
[BLK_IDX_VL_FORWARDING_PARAMS] = {0},
693
695
[BLK_IDX_L2_LOOKUP_PARAMS] = {
694
696
.entry_packing = sja1105et_l2_lookup_params_entry_packing,
695
697
.cmd_packing = sja1105et_l2_lookup_params_cmd_packing,
···
695
703
.packed_size = SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,
696
704
.addr = 0x38,
697
705
},
698
-
[BLK_IDX_L2_FORWARDING_PARAMS] = {0},
699
-
[BLK_IDX_AVB_PARAMS] = {0},
700
706
[BLK_IDX_GENERAL_PARAMS] = {
701
707
.entry_packing = sja1105et_general_params_entry_packing,
702
708
.cmd_packing = sja1105et_general_params_cmd_packing,
···
719
729
.packed_size = SJA1105ET_SIZE_CBS_DYN_CMD,
720
730
.addr = 0x2c,
721
731
},
722
-
[BLK_IDX_XMII_PARAMS] = {0},
723
732
};
724
733
725
734
/* SJA1105P/Q/R/S: Second generation */
726
-
struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {
727
-
[BLK_IDX_SCHEDULE] = {0},
728
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {0},
735
+
const struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {
729
736
[BLK_IDX_VL_LOOKUP] = {
730
737
.entry_packing = sja1105_vl_lookup_entry_packing,
731
738
.cmd_packing = sja1105_vl_lookup_cmd_packing,
···
731
744
.packed_size = SJA1105PQRS_SJA1105_SIZE_VL_LOOKUP_DYN_CMD,
732
745
.addr = 0x47,
733
746
},
734
-
[BLK_IDX_VL_POLICING] = {0},
735
-
[BLK_IDX_VL_FORWARDING] = {0},
736
747
[BLK_IDX_L2_LOOKUP] = {
737
748
.entry_packing = sja1105pqrs_dyn_l2_lookup_entry_packing,
738
749
.cmd_packing = sja1105pqrs_l2_lookup_cmd_packing,
···
747
762
.packed_size = SJA1105PQRS_SIZE_L2_LOOKUP_DYN_CMD,
748
763
.addr = 0x24,
749
764
},
750
-
[BLK_IDX_L2_POLICING] = {0},
751
765
[BLK_IDX_VLAN_LOOKUP] = {
752
766
.entry_packing = sja1105_vlan_lookup_entry_packing,
753
767
.cmd_packing = sja1105_vlan_lookup_cmd_packing,
···
771
787
.packed_size = SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD,
772
788
.addr = 0x4B,
773
789
},
774
-
[BLK_IDX_SCHEDULE_PARAMS] = {0},
775
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {0},
776
-
[BLK_IDX_VL_FORWARDING_PARAMS] = {0},
777
790
[BLK_IDX_L2_LOOKUP_PARAMS] = {
778
791
.entry_packing = sja1105pqrs_l2_lookup_params_entry_packing,
779
792
.cmd_packing = sja1105pqrs_l2_lookup_params_cmd_packing,
···
779
798
.packed_size = SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,
780
799
.addr = 0x54,
781
800
},
782
-
[BLK_IDX_L2_FORWARDING_PARAMS] = {0},
783
801
[BLK_IDX_AVB_PARAMS] = {
784
802
.entry_packing = sja1105pqrs_avb_params_entry_packing,
785
803
.cmd_packing = sja1105pqrs_avb_params_cmd_packing,
···
811
831
.packed_size = SJA1105PQRS_SIZE_CBS_DYN_CMD,
812
832
.addr = 0x32,
813
833
},
814
-
[BLK_IDX_XMII_PARAMS] = {0},
815
834
};
816
835
817
836
/* Provides read access to the settings through the dynamic interface
+2
-2
drivers/net/dsa/sja1105/sja1105_dynamic_config.h
+2
-2
drivers/net/dsa/sja1105/sja1105_dynamic_config.h
···
34
34
u64 index;
35
35
};
36
36
37
-
extern struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN];
38
-
extern struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN];
37
+
extern const struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN];
38
+
extern const struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN];
39
39
40
40
#endif
+11
-6
drivers/net/dsa/sja1105/sja1105_spi.c
+11
-6
drivers/net/dsa/sja1105/sja1105_spi.c
···
507
507
.ptpsyncts = 0x1F,
508
508
};
509
509
510
-
struct sja1105_info sja1105e_info = {
510
+
const struct sja1105_info sja1105e_info = {
511
511
.device_id = SJA1105E_DEVICE_ID,
512
512
.part_no = SJA1105ET_PART_NO,
513
513
.static_ops = sja1105e_table_ops,
···
523
523
.regs = &sja1105et_regs,
524
524
.name = "SJA1105E",
525
525
};
526
-
struct sja1105_info sja1105t_info = {
526
+
527
+
const struct sja1105_info sja1105t_info = {
527
528
.device_id = SJA1105T_DEVICE_ID,
528
529
.part_no = SJA1105ET_PART_NO,
529
530
.static_ops = sja1105t_table_ops,
···
540
539
.regs = &sja1105et_regs,
541
540
.name = "SJA1105T",
542
541
};
543
-
struct sja1105_info sja1105p_info = {
542
+
543
+
const struct sja1105_info sja1105p_info = {
544
544
.device_id = SJA1105PR_DEVICE_ID,
545
545
.part_no = SJA1105P_PART_NO,
546
546
.static_ops = sja1105p_table_ops,
···
558
556
.regs = &sja1105pqrs_regs,
559
557
.name = "SJA1105P",
560
558
};
561
-
struct sja1105_info sja1105q_info = {
559
+
560
+
const struct sja1105_info sja1105q_info = {
562
561
.device_id = SJA1105QS_DEVICE_ID,
563
562
.part_no = SJA1105Q_PART_NO,
564
563
.static_ops = sja1105q_table_ops,
···
576
573
.regs = &sja1105pqrs_regs,
577
574
.name = "SJA1105Q",
578
575
};
579
-
struct sja1105_info sja1105r_info = {
576
+
577
+
const struct sja1105_info sja1105r_info = {
580
578
.device_id = SJA1105PR_DEVICE_ID,
581
579
.part_no = SJA1105R_PART_NO,
582
580
.static_ops = sja1105r_table_ops,
···
594
590
.regs = &sja1105pqrs_regs,
595
591
.name = "SJA1105R",
596
592
};
597
-
struct sja1105_info sja1105s_info = {
593
+
594
+
const struct sja1105_info sja1105s_info = {
598
595
.device_id = SJA1105QS_DEVICE_ID,
599
596
.part_no = SJA1105S_PART_NO,
600
597
.static_ops = sja1105s_table_ops,
+6
-30
drivers/net/dsa/sja1105/sja1105_static_config.c
+6
-30
drivers/net/dsa/sja1105/sja1105_static_config.c
···
838
838
/* Compatibility matrices */
839
839
840
840
/* SJA1105E: First generation, no TTEthernet */
841
-
struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {
842
-
[BLK_IDX_SCHEDULE] = {0},
843
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {0},
844
-
[BLK_IDX_VL_LOOKUP] = {0},
845
-
[BLK_IDX_VL_POLICING] = {0},
846
-
[BLK_IDX_VL_FORWARDING] = {0},
841
+
const struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {
847
842
[BLK_IDX_L2_LOOKUP] = {
848
843
.packing = sja1105et_l2_lookup_entry_packing,
849
844
.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),
···
869
874
.packed_entry_size = SJA1105ET_SIZE_MAC_CONFIG_ENTRY,
870
875
.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,
871
876
},
872
-
[BLK_IDX_SCHEDULE_PARAMS] = {0},
873
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {0},
874
-
[BLK_IDX_VL_FORWARDING_PARAMS] = {0},
875
877
[BLK_IDX_L2_LOOKUP_PARAMS] = {
876
878
.packing = sja1105et_l2_lookup_params_entry_packing,
877
879
.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_params_entry),
···
908
916
};
909
917
910
918
/* SJA1105T: First generation, TTEthernet */
911
-
struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {
919
+
const struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {
912
920
[BLK_IDX_SCHEDULE] = {
913
921
.packing = sja1105_schedule_entry_packing,
914
922
.unpacked_entry_size = sizeof(struct sja1105_schedule_entry),
···
1026
1034
};
1027
1035
1028
1036
/* SJA1105P: Second generation, no TTEthernet, no SGMII */
1029
-
struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {
1030
-
[BLK_IDX_SCHEDULE] = {0},
1031
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {0},
1032
-
[BLK_IDX_VL_LOOKUP] = {0},
1033
-
[BLK_IDX_VL_POLICING] = {0},
1034
-
[BLK_IDX_VL_FORWARDING] = {0},
1037
+
const struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {
1035
1038
[BLK_IDX_L2_LOOKUP] = {
1036
1039
.packing = sja1105pqrs_l2_lookup_entry_packing,
1037
1040
.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),
···
1057
1070
.packed_entry_size = SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY,
1058
1071
.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,
1059
1072
},
1060
-
[BLK_IDX_SCHEDULE_PARAMS] = {0},
1061
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {0},
1062
-
[BLK_IDX_VL_FORWARDING_PARAMS] = {0},
1063
1073
[BLK_IDX_L2_LOOKUP_PARAMS] = {
1064
1074
.packing = sja1105pqrs_l2_lookup_params_entry_packing,
1065
1075
.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_params_entry),
···
1096
1112
};
1097
1113
1098
1114
/* SJA1105Q: Second generation, TTEthernet, no SGMII */
1099
-
struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {
1115
+
const struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {
1100
1116
[BLK_IDX_SCHEDULE] = {
1101
1117
.packing = sja1105_schedule_entry_packing,
1102
1118
.unpacked_entry_size = sizeof(struct sja1105_schedule_entry),
···
1214
1230
};
1215
1231
1216
1232
/* SJA1105R: Second generation, no TTEthernet, SGMII */
1217
-
struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {
1218
-
[BLK_IDX_SCHEDULE] = {0},
1219
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {0},
1220
-
[BLK_IDX_VL_LOOKUP] = {0},
1221
-
[BLK_IDX_VL_POLICING] = {0},
1222
-
[BLK_IDX_VL_FORWARDING] = {0},
1233
+
const struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {
1223
1234
[BLK_IDX_L2_LOOKUP] = {
1224
1235
.packing = sja1105pqrs_l2_lookup_entry_packing,
1225
1236
.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),
···
1245
1266
.packed_entry_size = SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY,
1246
1267
.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,
1247
1268
},
1248
-
[BLK_IDX_SCHEDULE_PARAMS] = {0},
1249
-
[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {0},
1250
-
[BLK_IDX_VL_FORWARDING_PARAMS] = {0},
1251
1269
[BLK_IDX_L2_LOOKUP_PARAMS] = {
1252
1270
.packing = sja1105pqrs_l2_lookup_params_entry_packing,
1253
1271
.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_params_entry),
···
1284
1308
};
1285
1309
1286
1310
/* SJA1105S: Second generation, TTEthernet, SGMII */
1287
-
struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {
1311
+
const struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {
1288
1312
[BLK_IDX_SCHEDULE] = {
1289
1313
.packing = sja1105_schedule_entry_packing,
1290
1314
.unpacked_entry_size = sizeof(struct sja1105_schedule_entry),
+6
-6
drivers/net/dsa/sja1105/sja1105_static_config.h
+6
-6
drivers/net/dsa/sja1105/sja1105_static_config.h
···
381
381
struct sja1105_table tables[BLK_IDX_MAX];
382
382
};
383
383
384
-
extern struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX];
385
-
extern struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX];
386
-
extern struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX];
387
-
extern struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX];
388
-
extern struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX];
389
-
extern struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX];
384
+
extern const struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX];
385
+
extern const struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX];
386
+
extern const struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX];
387
+
extern const struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX];
388
+
extern const struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX];
389
+
extern const struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX];
390
390
391
391
size_t sja1105_table_header_packing(void *buf, void *hdr, enum packing_op op);
392
392
void