| Message ID | 1473200312-22438-1-git-send-email-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi Bjorn, > Stub the wcnss_ctrl API to allow compile testing wcnss function drivers. > > Cc: Marcel Holtmann <marcel@holtmann.org> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > > There are no other pending changes colliding with this, so if Andy is okay with > this it could be merged through Kalle's tree - together with the other patches. > > Marcel, with this applied we can drop the depends on QCOM_SMD from the > btqcomsmd driver as well. sounds great. As soon as this lands in net-next, then please send a patch to remove the dependency. I will pull in net-next into bluetooth-next then. Regards Marcel
On Tue, Sep 06, 2016 at 03:18:29PM -0700, Bjorn Andersson wrote: > Stub the wcnss_ctrl API to allow compile testing wcnss function drivers. > > Cc: Marcel Holtmann <marcel@holtmann.org> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > > There are no other pending changes colliding with this, so if Andy is okay with > this it could be merged through Kalle's tree - together with the other patches. > > Marcel, with this applied we can drop the depends on QCOM_SMD from the > btqcomsmd driver as well. > > Changes since v3: > - Added this patch to allow compile testing without SMD support after patch 2 > > include/linux/soc/qcom/wcnss_ctrl.h | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > This is fine. Acked-by: Andy Gross <andy.gross@linaro.org>
Andy Gross <andy.gross@linaro.org> writes: > On Tue, Sep 06, 2016 at 03:18:29PM -0700, Bjorn Andersson wrote: >> Stub the wcnss_ctrl API to allow compile testing wcnss function drivers. >> >> Cc: Marcel Holtmann <marcel@holtmann.org> >> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> >> --- >> >> There are no other pending changes colliding with this, so if Andy is okay with >> this it could be merged through Kalle's tree - together with the other patches. >> >> Marcel, with this applied we can drop the depends on QCOM_SMD from the >> btqcomsmd driver as well. >> >> Changes since v3: >> - Added this patch to allow compile testing without SMD support after patch 2 >> >> include/linux/soc/qcom/wcnss_ctrl.h | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> > > This is fine. > > Acked-by: Andy Gross <andy.gross@linaro.org> Thanks. I'll then apply this to my ath.git tree and it will go to Linus via net-next.
diff --git a/include/linux/soc/qcom/wcnss_ctrl.h b/include/linux/soc/qcom/wcnss_ctrl.h index a37bc5538f19..eab64976a73b 100644 --- a/include/linux/soc/qcom/wcnss_ctrl.h +++ b/include/linux/soc/qcom/wcnss_ctrl.h @@ -3,6 +3,19 @@ #include <linux/soc/qcom/smd.h> +#if IS_ENABLED(CONFIG_QCOM_WCNSS_CTRL) + struct qcom_smd_channel *qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb); +#else + +static inline struct qcom_smd_channel* +qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb) +{ + WARN_ON(1); + return ERR_PTR(-ENXIO); +} + +#endif + #endif
Stub the wcnss_ctrl API to allow compile testing wcnss function drivers. Cc: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- There are no other pending changes colliding with this, so if Andy is okay with this it could be merged through Kalle's tree - together with the other patches. Marcel, with this applied we can drop the depends on QCOM_SMD from the btqcomsmd driver as well. Changes since v3: - Added this patch to allow compile testing without SMD support after patch 2 include/linux/soc/qcom/wcnss_ctrl.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)