On 11/14/22 04:29, Charles Keepax wrote:
Provide stub functions when CONFIG_SOUNDWIRE is not set for functions that are quite likely to be used from common code on devices supporting multiple control buses.
So far this case has been covered by splitting SoundWire related code away from, say I2C, and with a clear 'depends on SOUNDWIRE'. This is the case for rt5682, max98373, etc.
Is this not good enough?
I am not against this patch, just wondering if allowing code for different interfaces to be part of the same file will lead to confusions with e.g. register offsets or functionality exposed with different registers.
Signed-off-by: Charles Keepax ckeepax@opensource.cirrus.com
include/linux/soundwire/sdw.h | 92 +++++++++++++++++++++++++++++++---- 1 file changed, 82 insertions(+), 10 deletions(-)
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 902ed46f76c80..4f80cba898f11 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -1021,15 +1021,8 @@ int sdw_stream_add_master(struct sdw_bus *bus, struct sdw_port_config *port_config, unsigned int num_ports, struct sdw_stream_runtime *stream); -int sdw_stream_add_slave(struct sdw_slave *slave,
struct sdw_stream_config *stream_config,struct sdw_port_config *port_config,unsigned int num_ports,struct sdw_stream_runtime *stream);int sdw_stream_remove_master(struct sdw_bus *bus, struct sdw_stream_runtime *stream); -int sdw_stream_remove_slave(struct sdw_slave *slave,
struct sdw_stream_runtime *stream);int sdw_startup_stream(void *sdw_substream); int sdw_prepare_stream(struct sdw_stream_runtime *stream); int sdw_enable_stream(struct sdw_stream_runtime *stream); @@ -1040,8 +1033,20 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus); int sdw_bus_clk_stop(struct sdw_bus *bus); int sdw_bus_exit_clk_stop(struct sdw_bus *bus);
-/* messaging and data APIs */ +int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id); +void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id);
+#if IS_ENABLED(CONFIG_SOUNDWIRE)
+int sdw_stream_add_slave(struct sdw_slave *slave,
struct sdw_stream_config *stream_config,struct sdw_port_config *port_config,unsigned int num_ports,struct sdw_stream_runtime *stream);+int sdw_stream_remove_slave(struct sdw_slave *slave,
struct sdw_stream_runtime *stream);+/* messaging and data APIs */ int sdw_read(struct sdw_slave *slave, u32 addr); int sdw_write(struct sdw_slave *slave, u32 addr, u8 value); int sdw_write_no_pm(struct sdw_slave *slave, u32 addr, u8 value); @@ -1053,7 +1058,74 @@ int sdw_nwrite_no_pm(struct sdw_slave *slave, u32 addr, size_t count, const u8 * int sdw_update(struct sdw_slave *slave, u32 addr, u8 mask, u8 val); int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
-int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id); -void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id); +#else
+static inline int sdw_stream_add_slave(struct sdw_slave *slave,
struct sdw_stream_config *stream_config,struct sdw_port_config *port_config,unsigned int num_ports,struct sdw_stream_runtime *stream)+{
- return 0;
+}
+static inline int sdw_stream_remove_slave(struct sdw_slave *slave,
struct sdw_stream_runtime *stream)+{
- return 0;
+}
+/* messaging and data APIs */ +static inline int sdw_read(struct sdw_slave *slave, u32 addr) +{
- return 0;
+}
+static inline int sdw_write(struct sdw_slave *slave, u32 addr, u8 value) +{
- return 0;
+}
+static inline int sdw_write_no_pm(struct sdw_slave *slave, u32 addr, u8 value) +{
- return 0;
+}
+static inline int sdw_read_no_pm(struct sdw_slave *slave, u32 addr) +{
- return 0;
+}
+static inline int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val) +{
- return 0;
+}
+static inline int sdw_nread_no_pm(struct sdw_slave *slave, u32 addr, size_t count, u8 *val) +{
- return 0;
+}
+static inline int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, const u8 *val) +{
- return 0;
+}
+static inline int sdw_nwrite_no_pm(struct sdw_slave *slave, u32 addr, size_t count, const u8 *val) +{
- return 0;
+}
+static inline int sdw_update(struct sdw_slave *slave, u32 addr, u8 mask, u8 val) +{
- return 0;
+}
+static inline int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val) +{
- return 0;
+}
+#endif /* CONFIG_SOUNDWIRE */
#endif /* __SOUNDWIRE_H */