| Message ID | 20230201101559.15529-22-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 419405c92299d793b95053aa54d95e2d3f45a1a4 |
| Headers | show |
| Series | interconnect: fix racy provider registration | expand |
On 1.02.2023 11:15, Johan Hovold wrote: > Now that all interconnect drivers have been converted to the new > provider registration API, the old racy interface can be removed. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/interconnect/core.c | 16 ---------------- > include/linux/interconnect-provider.h | 11 ----------- > 2 files changed, 27 deletions(-) > > diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c > index 93d27ff8eef6..b8917823fd95 100644 > --- a/drivers/interconnect/core.c > +++ b/drivers/interconnect/core.c > @@ -1078,22 +1078,6 @@ void icc_provider_deregister(struct icc_provider *provider) > } > EXPORT_SYMBOL_GPL(icc_provider_deregister); > > -int icc_provider_add(struct icc_provider *provider) > -{ > - icc_provider_init(provider); > - > - return icc_provider_register(provider); > -} > -EXPORT_SYMBOL_GPL(icc_provider_add); > - > -void icc_provider_del(struct icc_provider *provider) > -{ > - WARN_ON(!list_empty(&provider->nodes)); > - > - icc_provider_deregister(provider); > -} > -EXPORT_SYMBOL_GPL(icc_provider_del); > - > static const struct of_device_id __maybe_unused ignore_list[] = { > { .compatible = "qcom,sc7180-ipa-virt" }, > { .compatible = "qcom,sc8180x-ipa-virt" }, > diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h > index d12cd18aab3f..b9af9016a95e 100644 > --- a/include/linux/interconnect-provider.h > +++ b/include/linux/interconnect-provider.h > @@ -125,8 +125,6 @@ int icc_nodes_remove(struct icc_provider *provider); > void icc_provider_init(struct icc_provider *provider); > int icc_provider_register(struct icc_provider *provider); > void icc_provider_deregister(struct icc_provider *provider); > -int icc_provider_add(struct icc_provider *provider); > -void icc_provider_del(struct icc_provider *provider); > struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec); > void icc_sync_state(struct device *dev); > > @@ -179,15 +177,6 @@ static inline int icc_provider_register(struct icc_provider *provider) > > static inline void icc_provider_deregister(struct icc_provider *provider) { } > > -static inline int icc_provider_add(struct icc_provider *provider) > -{ > - return -ENOTSUPP; > -} > - > -static inline void icc_provider_del(struct icc_provider *provider) > -{ > -} > - > static inline struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) > { > return ERR_PTR(-ENOTSUPP);
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 93d27ff8eef6..b8917823fd95 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -1078,22 +1078,6 @@ void icc_provider_deregister(struct icc_provider *provider) } EXPORT_SYMBOL_GPL(icc_provider_deregister); -int icc_provider_add(struct icc_provider *provider) -{ - icc_provider_init(provider); - - return icc_provider_register(provider); -} -EXPORT_SYMBOL_GPL(icc_provider_add); - -void icc_provider_del(struct icc_provider *provider) -{ - WARN_ON(!list_empty(&provider->nodes)); - - icc_provider_deregister(provider); -} -EXPORT_SYMBOL_GPL(icc_provider_del); - static const struct of_device_id __maybe_unused ignore_list[] = { { .compatible = "qcom,sc7180-ipa-virt" }, { .compatible = "qcom,sc8180x-ipa-virt" }, diff --git a/include/linux/interconnect-provider.h b/include/linux/interconnect-provider.h index d12cd18aab3f..b9af9016a95e 100644 --- a/include/linux/interconnect-provider.h +++ b/include/linux/interconnect-provider.h @@ -125,8 +125,6 @@ int icc_nodes_remove(struct icc_provider *provider); void icc_provider_init(struct icc_provider *provider); int icc_provider_register(struct icc_provider *provider); void icc_provider_deregister(struct icc_provider *provider); -int icc_provider_add(struct icc_provider *provider); -void icc_provider_del(struct icc_provider *provider); struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec); void icc_sync_state(struct device *dev); @@ -179,15 +177,6 @@ static inline int icc_provider_register(struct icc_provider *provider) static inline void icc_provider_deregister(struct icc_provider *provider) { } -static inline int icc_provider_add(struct icc_provider *provider) -{ - return -ENOTSUPP; -} - -static inline void icc_provider_del(struct icc_provider *provider) -{ -} - static inline struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) { return ERR_PTR(-ENOTSUPP);
Now that all interconnect drivers have been converted to the new provider registration API, the old racy interface can be removed. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/interconnect/core.c | 16 ---------------- include/linux/interconnect-provider.h | 11 ----------- 2 files changed, 27 deletions(-)