Commit 7a8c7f5c authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: b53: Fix build with B53_SRAB enabled and not B53_SERDES

In case B53_SRAB is enabled, but not B53_SERDES, we can get the
following linking error:

ERROR: "b53_serdes_init" [drivers/net/dsa/b53/b53_srab.ko] undefined!

We also need to ifdef the body of b53_srab_serdes_map_lane() since it
would not be used when B53_SERDES is disabled and that would produce a
warning.

Fixes: 0e01491d ("net: dsa: b53: Add SerDes support")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a89cdd8e
...@@ -118,4 +118,11 @@ void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode, ...@@ -118,4 +118,11 @@ void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,
void b53_serdes_phylink_validate(struct b53_device *dev, int port, void b53_serdes_phylink_validate(struct b53_device *dev, int port,
unsigned long *supported, unsigned long *supported,
struct phylink_link_state *state); struct phylink_link_state *state);
#if IS_ENABLED(CONFIG_B53_SERDES)
int b53_serdes_init(struct b53_device *dev, int port); int b53_serdes_init(struct b53_device *dev, int port);
#else
static inline int b53_serdes_init(struct b53_device *dev, int port)
{
return -ENODEV;
}
#endif
...@@ -390,6 +390,7 @@ static irqreturn_t b53_srab_port_isr(int irq, void *dev_id) ...@@ -390,6 +390,7 @@ static irqreturn_t b53_srab_port_isr(int irq, void *dev_id)
return IRQ_WAKE_THREAD; return IRQ_WAKE_THREAD;
} }
#if IS_ENABLED(CONFIG_B53_SERDES)
static u8 b53_srab_serdes_map_lane(struct b53_device *dev, int port) static u8 b53_srab_serdes_map_lane(struct b53_device *dev, int port)
{ {
struct b53_srab_priv *priv = dev->priv; struct b53_srab_priv *priv = dev->priv;
...@@ -407,6 +408,7 @@ static u8 b53_srab_serdes_map_lane(struct b53_device *dev, int port) ...@@ -407,6 +408,7 @@ static u8 b53_srab_serdes_map_lane(struct b53_device *dev, int port)
return B53_INVALID_LANE; return B53_INVALID_LANE;
} }
} }
#endif
static int b53_srab_irq_enable(struct b53_device *dev, int port) static int b53_srab_irq_enable(struct b53_device *dev, int port)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment