2022-03-01 23:20:22

by Georgi Djakov

Subject: [PATCH] interconnect: Add stubs for the bulk API

Add stub functions for the bulk API to allow compile testing.

Signed-off-by: Georgi Djakov <[email protected]>
---
include/linux/interconnect.h | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h
index f2dd2fc8d3cd..f685777b875e 100644
--- a/include/linux/interconnect.h
+++ b/include/linux/interconnect.h
@@ -38,13 +38,6 @@ struct icc_bulk_data {
u32 peak_bw;
};

-int __must_check of_icc_bulk_get(struct device *dev, int num_paths,
- struct icc_bulk_data *paths);
-void icc_bulk_put(int num_paths, struct icc_bulk_data *paths);
-int icc_bulk_set_bw(int num_paths, const struct icc_bulk_data *paths);
-int icc_bulk_enable(int num_paths, const struct icc_bulk_data *paths);
-void icc_bulk_disable(int num_paths, const struct icc_bulk_data *paths);
-
#if IS_ENABLED(CONFIG_INTERCONNECT)

struct icc_path *icc_get(struct device *dev, const int src_id,
@@ -58,6 +51,12 @@ int icc_disable(struct icc_path *path);
int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw);
void icc_set_tag(struct icc_path *path, u32 tag);
const char *icc_get_name(struct icc_path *path);
+int __must_check of_icc_bulk_get(struct device *dev, int num_paths,
+ struct icc_bulk_data *paths);
+void icc_bulk_put(int num_paths, struct icc_bulk_data *paths);
+int icc_bulk_set_bw(int num_paths, const struct icc_bulk_data *paths);
+int icc_bulk_enable(int num_paths, const struct icc_bulk_data *paths);
+void icc_bulk_disable(int num_paths, const struct icc_bulk_data *paths);

#else

@@ -112,6 +111,29 @@ static inline const char *icc_get_name(struct icc_path *path)
return NULL;
}

+static inline int of_icc_bulk_get(struct device *dev, int num_paths, struct icc_bulk_data *paths)
+{
+ return 0;
+}
+
+static inline void icc_bulk_put(int num_paths, struct icc_bulk_data *paths)
+{
+}
+
+static inline int icc_bulk_set_bw(int num_paths, const struct icc_bulk_data *paths)
+{
+ return 0;
+}
+
+static inline int icc_bulk_enable(int num_paths, const struct icc_bulk_data *paths)
+{
+ return 0;
+}
+
+static inline void icc_bulk_disable(int num_paths, const struct icc_bulk_data *paths)
+{
+}
+
#endif /* CONFIG_INTERCONNECT */

#endif /* __LINUX_INTERCONNECT_H */

2022-03-02 08:47:30

by Alex Elder

Subject: Re: [PATCH] interconnect: Add stubs for the bulk API

On 3/1/22 3:07 AM, Georgi Djakov wrote:
> Add stub functions for the bulk API to allow compile testing.
>
> Signed-off-by: Georgi Djakov <[email protected]>

I have this patch--almost exactly--sitting in my queue waiting
for another to get accepted.

Thanks Georgi, it looks good to me.

Reviewed-by: Alex Elder <[email protected]>

> ---
> include/linux/interconnect.h | 36 +++++++++++++++++++++++++++++-------
> 1 file changed, 29 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/interconnect.h b/include/linux/interconnect.h
> index f2dd2fc8d3cd..f685777b875e 100644
> --- a/include/linux/interconnect.h
> +++ b/include/linux/interconnect.h
> @@ -38,13 +38,6 @@ struct icc_bulk_data {
> u32 peak_bw;
> };
>
> -int __must_check of_icc_bulk_get(struct device *dev, int num_paths,
> - struct icc_bulk_data *paths);
> -void icc_bulk_put(int num_paths, struct icc_bulk_data *paths);
> -int icc_bulk_set_bw(int num_paths, const struct icc_bulk_data *paths);
> -int icc_bulk_enable(int num_paths, const struct icc_bulk_data *paths);
> -void icc_bulk_disable(int num_paths, const struct icc_bulk_data *paths);
> -
> #if IS_ENABLED(CONFIG_INTERCONNECT)
>
> struct icc_path *icc_get(struct device *dev, const int src_id,
> @@ -58,6 +51,12 @@ int icc_disable(struct icc_path *path);
> int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw);
> void icc_set_tag(struct icc_path *path, u32 tag);
> const char *icc_get_name(struct icc_path *path);
> +int __must_check of_icc_bulk_get(struct device *dev, int num_paths,
> + struct icc_bulk_data *paths);
> +void icc_bulk_put(int num_paths, struct icc_bulk_data *paths);
> +int icc_bulk_set_bw(int num_paths, const struct icc_bulk_data *paths);
> +int icc_bulk_enable(int num_paths, const struct icc_bulk_data *paths);
> +void icc_bulk_disable(int num_paths, const struct icc_bulk_data *paths);
>
> #else
>
> @@ -112,6 +111,29 @@ static inline const char *icc_get_name(struct icc_path *path)
> return NULL;
> }
>
> +static inline int of_icc_bulk_get(struct device *dev, int num_paths, struct icc_bulk_data *paths)
> +{
> + return 0;
> +}
> +
> +static inline void icc_bulk_put(int num_paths, struct icc_bulk_data *paths)
> +{
> +}
> +
> +static inline int icc_bulk_set_bw(int num_paths, const struct icc_bulk_data *paths)
> +{
> + return 0;
> +}
> +
> +static inline int icc_bulk_enable(int num_paths, const struct icc_bulk_data *paths)
> +{
> + return 0;
> +}
> +
> +static inline void icc_bulk_disable(int num_paths, const struct icc_bulk_data *paths)
> +{
> +}
> +
> #endif /* CONFIG_INTERCONNECT */
>
> #endif /* __LINUX_INTERCONNECT_H */