aboutsummaryrefslogtreecommitdiff
path: root/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
diff options
context:
space:
mode:
authorRobert Marko <robimarko@gmail.com>2023-06-02 12:27:19 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-02 21:20:53 +0200
commiteffccdd444a956afc5493ef8f1c79a7e7ffa8490 (patch)
tree2bad89f178754f71e1bc21fda2b04dbcbccee82d /target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
parent3886ea9b87c416c080078603fedea95bcc144442 (diff)
generic: b53: rename exported symbols to avoid upstream conflict
Upstream DSA driver is exporting symbols with the same name as our downstream swconfig driver, so lets rename the downstream symbols to make them unique and avoid the conflict on 6.1 kernel. Without this change, building 6.1 with kmod-switch-bcm53xx would conflict with the B53 DSA driver and CI would fail. Signed-off-by: Robert Marko <robimarko@gmail.com>
Diffstat (limited to 'target/linux/generic/files/drivers/net/phy/b53/b53_spi.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c b/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
index efc8f7ee89..400454df18 100644
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_spi.c
@@ -288,14 +288,14 @@ static int b53_spi_probe(struct spi_device *spi)
struct b53_device *dev;
int ret;
- dev = b53_switch_alloc(&spi->dev, &b53_spi_ops, spi);
+ dev = b53_swconfig_switch_alloc(&spi->dev, &b53_spi_ops, spi);
if (!dev)
return -ENOMEM;
if (spi->dev.platform_data)
dev->pdata = spi->dev.platform_data;
- ret = b53_switch_register(dev);
+ ret = b53_swconfig_switch_register(dev);
if (ret)
return ret;
Powered by cgit, Themed by Ted Yin.