Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: mscc: ocelot: un-export unused regmap symbols
There are no external users of the vsc7514_*_regmap[] symbols or
vsc7514_vcap_* functions. They were exported in commit 32ecd22ba60b ("net:
mscc: ocelot: split register definitions to a separate file") with the
intention of being used, but the actual structure used in commit
2efaca411c96 ("net: mscc: ocelot: expose vsc7514_regmap definition") ended
up being all that was needed.
Bury these unnecessary symbols.
Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Suggested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230204182056.25502-1-colin.foster@in-advantage.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
authored by
Colin Foster
and committed by
Jakub Kicinski
b1ca2f1b
9ac543c0
+14
-44
+14
-28
drivers/net/ethernet/mscc/vsc7514_regs.c
+14
-28
drivers/net/ethernet/mscc/vsc7514_regs.c
···
68
68
};
69
69
EXPORT_SYMBOL(vsc7514_regfields);
70
70
71
-
const u32 vsc7514_ana_regmap[] = {
71
+
static const u32 vsc7514_ana_regmap[] = {
72
72
REG(ANA_ADVLEARN, 0x009000),
73
73
REG(ANA_VLANMASK, 0x009004),
74
74
REG(ANA_PORT_B_DOMAIN, 0x009008),
···
148
148
REG(ANA_POL_HYST, 0x008bec),
149
149
REG(ANA_POL_MISC_CFG, 0x008bf0),
150
150
};
151
-
EXPORT_SYMBOL(vsc7514_ana_regmap);
152
151
153
-
const u32 vsc7514_qs_regmap[] = {
152
+
static const u32 vsc7514_qs_regmap[] = {
154
153
REG(QS_XTR_GRP_CFG, 0x000000),
155
154
REG(QS_XTR_RD, 0x000008),
156
155
REG(QS_XTR_FRM_PRUNING, 0x000010),
···
163
164
REG(QS_INJ_ERR, 0x000040),
164
165
REG(QS_INH_DBG, 0x000048),
165
166
};
166
-
EXPORT_SYMBOL(vsc7514_qs_regmap);
167
167
168
-
const u32 vsc7514_qsys_regmap[] = {
168
+
static const u32 vsc7514_qsys_regmap[] = {
169
169
REG(QSYS_PORT_MODE, 0x011200),
170
170
REG(QSYS_SWITCH_PORT_MODE, 0x011234),
171
171
REG(QSYS_STAT_CNT_CFG, 0x011264),
···
207
209
REG(QSYS_SE_STATE, 0x00004c),
208
210
REG(QSYS_HSCH_MISC_CFG, 0x011388),
209
211
};
210
-
EXPORT_SYMBOL(vsc7514_qsys_regmap);
211
212
212
-
const u32 vsc7514_rew_regmap[] = {
213
+
static const u32 vsc7514_rew_regmap[] = {
213
214
REG(REW_PORT_VLAN_CFG, 0x000000),
214
215
REG(REW_TAG_CFG, 0x000004),
215
216
REG(REW_PORT_CFG, 0x000008),
···
221
224
REG(REW_STAT_CFG, 0x000890),
222
225
REG(REW_PPT, 0x000680),
223
226
};
224
-
EXPORT_SYMBOL(vsc7514_rew_regmap);
225
227
226
-
const u32 vsc7514_sys_regmap[] = {
228
+
static const u32 vsc7514_sys_regmap[] = {
227
229
REG(SYS_COUNT_RX_OCTETS, 0x000000),
228
230
REG(SYS_COUNT_RX_UNICAST, 0x000004),
229
231
REG(SYS_COUNT_RX_MULTICAST, 0x000008),
···
343
347
REG(SYS_PTP_NXT, 0x0006c0),
344
348
REG(SYS_PTP_CFG, 0x0006c4),
345
349
};
346
-
EXPORT_SYMBOL(vsc7514_sys_regmap);
347
350
348
-
const u32 vsc7514_vcap_regmap[] = {
351
+
static const u32 vsc7514_vcap_regmap[] = {
349
352
/* VCAP_CORE_CFG */
350
353
REG(VCAP_CORE_UPDATE_CTRL, 0x000000),
351
354
REG(VCAP_CORE_MV_CFG, 0x000004),
···
366
371
REG(VCAP_CONST_CORE_CNT, 0x0003b8),
367
372
REG(VCAP_CONST_IF_CNT, 0x0003bc),
368
373
};
369
-
EXPORT_SYMBOL(vsc7514_vcap_regmap);
370
374
371
-
const u32 vsc7514_ptp_regmap[] = {
375
+
static const u32 vsc7514_ptp_regmap[] = {
372
376
REG(PTP_PIN_CFG, 0x000000),
373
377
REG(PTP_PIN_TOD_SEC_MSB, 0x000004),
374
378
REG(PTP_PIN_TOD_SEC_LSB, 0x000008),
···
378
384
REG(PTP_CLK_CFG_ADJ_CFG, 0x0000a4),
379
385
REG(PTP_CLK_CFG_ADJ_FREQ, 0x0000a8),
380
386
};
381
-
EXPORT_SYMBOL(vsc7514_ptp_regmap);
382
387
383
-
const u32 vsc7514_dev_gmii_regmap[] = {
388
+
static const u32 vsc7514_dev_gmii_regmap[] = {
384
389
REG(DEV_CLOCK_CFG, 0x0),
385
390
REG(DEV_PORT_MISC, 0x4),
386
391
REG(DEV_EVENTS, 0x8),
···
420
427
REG(DEV_PCS_FX100_CFG, 0x94),
421
428
REG(DEV_PCS_FX100_STATUS, 0x98),
422
429
};
423
-
EXPORT_SYMBOL(vsc7514_dev_gmii_regmap);
424
430
425
431
const u32 *vsc7514_regmap[TARGET_MAX] = {
426
432
[ANA] = vsc7514_ana_regmap,
···
435
443
};
436
444
EXPORT_SYMBOL(vsc7514_regmap);
437
445
438
-
const struct vcap_field vsc7514_vcap_es0_keys[] = {
446
+
static const struct vcap_field vsc7514_vcap_es0_keys[] = {
439
447
[VCAP_ES0_EGR_PORT] = { 0, 4 },
440
448
[VCAP_ES0_IGR_PORT] = { 4, 4 },
441
449
[VCAP_ES0_RSV] = { 8, 2 },
···
445
453
[VCAP_ES0_DP] = { 24, 1 },
446
454
[VCAP_ES0_PCP] = { 25, 3 },
447
455
};
448
-
EXPORT_SYMBOL(vsc7514_vcap_es0_keys);
449
456
450
-
const struct vcap_field vsc7514_vcap_es0_actions[] = {
457
+
static const struct vcap_field vsc7514_vcap_es0_actions[] = {
451
458
[VCAP_ES0_ACT_PUSH_OUTER_TAG] = { 0, 2 },
452
459
[VCAP_ES0_ACT_PUSH_INNER_TAG] = { 2, 1 },
453
460
[VCAP_ES0_ACT_TAG_A_TPID_SEL] = { 3, 2 },
···
466
475
[VCAP_ES0_ACT_RSV] = { 49, 24 },
467
476
[VCAP_ES0_ACT_HIT_STICKY] = { 73, 1 },
468
477
};
469
-
EXPORT_SYMBOL(vsc7514_vcap_es0_actions);
470
478
471
-
const struct vcap_field vsc7514_vcap_is1_keys[] = {
479
+
static const struct vcap_field vsc7514_vcap_is1_keys[] = {
472
480
[VCAP_IS1_HK_TYPE] = { 0, 1 },
473
481
[VCAP_IS1_HK_LOOKUP] = { 1, 2 },
474
482
[VCAP_IS1_HK_IGR_PORT_MASK] = { 3, 12 },
···
517
527
[VCAP_IS1_HK_IP4_L4_RNG] = { 148, 8 },
518
528
[VCAP_IS1_HK_IP4_IP_PAYLOAD_S1_5TUPLE] = { 156, 32 },
519
529
};
520
-
EXPORT_SYMBOL(vsc7514_vcap_is1_keys);
521
530
522
-
const struct vcap_field vsc7514_vcap_is1_actions[] = {
531
+
static const struct vcap_field vsc7514_vcap_is1_actions[] = {
523
532
[VCAP_IS1_ACT_DSCP_ENA] = { 0, 1 },
524
533
[VCAP_IS1_ACT_DSCP_VAL] = { 1, 6 },
525
534
[VCAP_IS1_ACT_QOS_ENA] = { 7, 1 },
···
541
552
[VCAP_IS1_ACT_CUSTOM_ACE_TYPE_ENA] = { 74, 4 },
542
553
[VCAP_IS1_ACT_HIT_STICKY] = { 78, 1 },
543
554
};
544
-
EXPORT_SYMBOL(vsc7514_vcap_is1_actions);
545
555
546
-
const struct vcap_field vsc7514_vcap_is2_keys[] = {
556
+
static const struct vcap_field vsc7514_vcap_is2_keys[] = {
547
557
/* Common: 46 bits */
548
558
[VCAP_IS2_TYPE] = { 0, 4 },
549
559
[VCAP_IS2_HK_FIRST] = { 4, 1 },
···
621
633
[VCAP_IS2_HK_OAM_CCM_CNTS_EQ0] = { 186, 1 },
622
634
[VCAP_IS2_HK_OAM_IS_Y1731] = { 187, 1 },
623
635
};
624
-
EXPORT_SYMBOL(vsc7514_vcap_is2_keys);
625
636
626
-
const struct vcap_field vsc7514_vcap_is2_actions[] = {
637
+
static const struct vcap_field vsc7514_vcap_is2_actions[] = {
627
638
[VCAP_IS2_ACT_HIT_ME_ONCE] = { 0, 1 },
628
639
[VCAP_IS2_ACT_CPU_COPY_ENA] = { 1, 1 },
629
640
[VCAP_IS2_ACT_CPU_QU_NUM] = { 2, 3 },
···
639
652
[VCAP_IS2_ACT_ACL_ID] = { 43, 6 },
640
653
[VCAP_IS2_ACT_HIT_CNT] = { 49, 32 },
641
654
};
642
-
EXPORT_SYMBOL(vsc7514_vcap_is2_actions);
643
655
644
656
struct vcap_props vsc7514_vcap_props[] = {
645
657
[VCAP_ES0] = {
-16
include/soc/mscc/vsc7514_regs.h
-16
include/soc/mscc/vsc7514_regs.h
···
14
14
15
15
extern const struct reg_field vsc7514_regfields[REGFIELD_MAX];
16
16
17
-
extern const u32 vsc7514_ana_regmap[];
18
-
extern const u32 vsc7514_qs_regmap[];
19
-
extern const u32 vsc7514_qsys_regmap[];
20
-
extern const u32 vsc7514_rew_regmap[];
21
-
extern const u32 vsc7514_sys_regmap[];
22
-
extern const u32 vsc7514_vcap_regmap[];
23
-
extern const u32 vsc7514_ptp_regmap[];
24
-
extern const u32 vsc7514_dev_gmii_regmap[];
25
-
26
17
extern const u32 *vsc7514_regmap[TARGET_MAX];
27
-
28
-
extern const struct vcap_field vsc7514_vcap_es0_keys[];
29
-
extern const struct vcap_field vsc7514_vcap_es0_actions[];
30
-
extern const struct vcap_field vsc7514_vcap_is1_keys[];
31
-
extern const struct vcap_field vsc7514_vcap_is1_actions[];
32
-
extern const struct vcap_field vsc7514_vcap_is2_keys[];
33
-
extern const struct vcap_field vsc7514_vcap_is2_actions[];
34
18
35
19
#endif