Skip to content

Commit a53655e

Browse files
plappermaulrobimarko
authored andcommitted
realtek: simplify backing serdes calculation
Calculating the backing serdes of a given frontend serdes does not need any info about the control structure. Drop the reference. Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de> Link: openwrt/openwrt#21157 Signed-off-by: Robert Marko <robimarko@gmail.com> (cherry picked from commit dcbc872)
1 parent 5db1b65 commit a53655e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto-serdes.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct rtsds_config {
5252
int sds_cnt;
5353
int page_cnt;
5454
int base;
55-
int (*get_backing_sds)(struct rtsds_ctrl *ctrl, int sds, int page);
55+
int (*get_backing_sds)(int sds, int page);
5656
int (*read)(struct rtsds_ctrl *ctrl, int sds, int page, int regnum);
5757
int (*write)(struct rtsds_ctrl *ctrl, int sds, int page, int regnum, u16 value);
5858
};
@@ -120,7 +120,7 @@ static int rtsds_dbg_registers_show(struct seq_file *seqf, void *unused)
120120
do {
121121
subpage = RTSDS_SUBPAGE(page);
122122
if (!subpage) {
123-
seq_printf(seqf, "Back SDS %02d:", ctrl->cfg->get_backing_sds(ctrl, sds, page));
123+
seq_printf(seqf, "Back SDS %02d:", ctrl->cfg->get_backing_sds(sds, page));
124124
for (regnum = 0; regnum < RTSDS_REG_CNT; regnum++)
125125
seq_printf(seqf, " %02X", regnum);
126126
seq_puts(seqf, "\n");
@@ -285,7 +285,7 @@ static int rtsds_839x_write(struct rtsds_ctrl *ctrl, int sds, int page, int regn
285285
return regmap_write(ctrl->map, ctrl->cfg->base + offset, write_value);
286286
}
287287

288-
static int rtsds_83xx_get_backing_sds(struct rtsds_ctrl *ctrl, int sds, int page)
288+
static int rtsds_83xx_get_backing_sds(int sds, int page)
289289
{
290290
return sds;
291291
}
@@ -321,7 +321,7 @@ static int rtsds_rt93xx_io(struct rtsds_ctrl *ctrl, int sds, int page, int regnu
321321
* - SerDes 2-9 are USXGMII capabable with either quad or single configuration
322322
* - SerDes 10-11 are 10GBase-R capable
323323
*/
324-
static int rtsds_930x_get_backing_sds(struct rtsds_ctrl *ctrl, int sds, int page)
324+
static int rtsds_930x_get_backing_sds(int sds, int page)
325325
{
326326
if (sds == 3 && page < 4)
327327
return 10;
@@ -360,7 +360,7 @@ static int rtsds_930x_get_backing_sds(struct rtsds_ctrl *ctrl, int sds, int page
360360
* page 0x40-0x7f (digi 1): page 0x00-0x3f back SDS page 0x00-0x3f back SDS+1
361361
* page 0x80-0xbf (digi 2): page 0x00-0x3f back SDS+1 page 0x00-0x3f back SDS+2
362362
*/
363-
static int rtsds_931x_get_backing_sds(struct rtsds_ctrl *ctrl, int sds, int page)
363+
static int rtsds_931x_get_backing_sds(int sds, int page)
364364
{
365365
int map[] = { 0, 1, 2, 3, 6, 7, 10, 11, 14, 15, 18, 19, 22, 23 };
366366
int backsds;
@@ -383,7 +383,7 @@ static int rtsds_93xx_read(struct rtsds_ctrl *ctrl, int sds, int page, int regnu
383383
int subpage = RTSDS_SUBPAGE(page);
384384
int ret, backsds, value;
385385

386-
backsds = ctrl->cfg->get_backing_sds(ctrl, sds, page);
386+
backsds = ctrl->cfg->get_backing_sds(sds, page);
387387
ret = rtsds_rt93xx_io(ctrl, backsds, subpage, regnum, RTSDS_93XX_CMD_READ);
388388
if (ret)
389389
return ret;
@@ -398,7 +398,7 @@ static int rtsds_93xx_write(struct rtsds_ctrl *ctrl, int sds, int page, int regn
398398
int subpage = RTSDS_SUBPAGE(page);
399399
int ret, backsds;
400400

401-
backsds = ctrl->cfg->get_backing_sds(ctrl, sds, page);
401+
backsds = ctrl->cfg->get_backing_sds(sds, page);
402402
ret = regmap_write(ctrl->map, ctrl->cfg->base + 4, value);
403403
if (ret)
404404
return ret;

0 commit comments

Comments
 (0)