diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-19 17:15:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-19 17:15:37 -0700 |
| commit | 484387c9a2d8cb4d21752b6dded10a43c7c22363 (patch) | |
| tree | 259622b3b3c89d210bfe12ee9edd1a97ae4505a8 /include | |
| parent | 0ae940c7a7734ed144103d67333e6b26342aa1e6 (diff) | |
| parent | 731410b76e86f72ae18a3a4018cdc30258b10beb (diff) | |
Merge branch 'bcm_sf2-platform-dev'
Florian Fainelli says:
====================
net: dsa: bcm_sf2: Platform conversion
This patch series converts the bcm_sf2 driver from a traditional DSA driver
into a platform_device driver and makes it use the new DSA binding that Andrew
introduced in the latest merge window.
Prior attempts used to coerce the code in net/dsa/dsa2.c to accept the old
binding, while really there is only one broken single user out there: bcm_sf2,
so instead, just assume the new DT binding is deployed and use it accordingly.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dsa.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 2217a3f817f8..d00c392bc9f8 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -386,4 +386,18 @@ static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst) void dsa_unregister_switch(struct dsa_switch *ds); int dsa_register_switch(struct dsa_switch *ds, struct device_node *np); +#ifdef CONFIG_PM_SLEEP +int dsa_switch_suspend(struct dsa_switch *ds); +int dsa_switch_resume(struct dsa_switch *ds); +#else +static inline int dsa_switch_suspend(struct dsa_switch *ds) +{ + return 0; +} +static inline int dsa_switch_resume(struct dsa_switch *ds) +{ + return 0; +} +#endif /* CONFIG_PM_SLEEP */ + #endif |