From: Prashant Malani <pmalani@chromium.org> To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: bleung@chromium.org, swboyd@chromium.org, heikki.krogerus@linux.intel.com, "Prashant Malani" <pmalani@chromium.org>, "kernel test robot" <lkp@intel.com>, "Nícolas F . R . A . Prado" <nfraprado@collabora.com>, "Andrzej Hajda" <andrzej.hajda@intel.com>, "Daniel Vetter" <daniel@ffwll.ch>, "David Airlie" <airlied@linux.ie>, devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Hsin-Yi Wang" <hsinyi@chromium.org>, "Jernej Skrabec" <jernej.skrabec@gmail.com>, "Jonas Karlman" <jonas@kwiboo.se>, "José Expósito" <jose.exposito89@gmail.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>, "Maxime Ripard" <maxime@cerno.tech>, "Neil Armstrong" <narmstrong@baylibre.com>, "Pin-Yen Lin" <treapking@chromium.org>, "Robert Foss" <robert.foss@linaro.org>, "Rob Herring" <robh+dt@kernel.org>, "Sam Ravnborg" <sam@ravnborg.org>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Xin Ji" <xji@analogixsemi.com> Subject: [PATCH v4 2/7] usb: typec: mux: Add CONFIG guards for functions Date: Wed, 15 Jun 2022 17:20:18 +0000 [thread overview] Message-ID: <20220615172129.1314056-3-pmalani@chromium.org> (raw) In-Reply-To: <20220615172129.1314056-1-pmalani@chromium.org> There are some drivers that can use the Type C mux API, but don't have to. Introduce CONFIG guards for the mux functions so that drivers can include the header file and not run into compilation errors on systems which don't have CONFIG_TYPEC enabled. When CONFIG_TYPEC is not enabled, the Type C mux functions will be stub versions of the original calls. Reported-by: kernel test robot <lkp@intel.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Signed-off-by: Prashant Malani <pmalani@chromium.org> --- Changes since v3: - No changes. Changes since v2: - Fix up return types for some of the stubs. Remove 1 unnecessary stub in the else condition. - Remove unnecessary IS_MODULE config guard. - Added Reviewed-by and Tested-by tags. Changes since v1: - Added static inline to stub functions. - Updated function signature of stub functions from "struct typec_mux" to "struct typec_mux_dev" in accordance with updates from commit 713fd49b430c ("usb: typec: mux: Introduce indirection") include/linux/usb/typec_mux.h | 44 ++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h index ee57781dcf28..9292f0e07846 100644 --- a/include/linux/usb/typec_mux.h +++ b/include/linux/usb/typec_mux.h @@ -58,17 +58,13 @@ struct typec_mux_desc { void *drvdata; }; +#if IS_ENABLED(CONFIG_TYPEC) + struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, const struct typec_altmode_desc *desc); void typec_mux_put(struct typec_mux *mux); int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state); -static inline struct typec_mux * -typec_mux_get(struct device *dev, const struct typec_altmode_desc *desc) -{ - return fwnode_typec_mux_get(dev_fwnode(dev), desc); -} - struct typec_mux_dev * typec_mux_register(struct device *parent, const struct typec_mux_desc *desc); void typec_mux_unregister(struct typec_mux_dev *mux); @@ -76,4 +72,40 @@ void typec_mux_unregister(struct typec_mux_dev *mux); void typec_mux_set_drvdata(struct typec_mux_dev *mux, void *data); void *typec_mux_get_drvdata(struct typec_mux_dev *mux); +#else + +static inline struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, + const struct typec_altmode_desc *desc) +{ + return NULL; +} + +static inline void typec_mux_put(struct typec_mux *mux) {} + +static inline int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) +{ + return 0; +} + +static inline struct typec_mux_dev * +typec_mux_register(struct device *parent, const struct typec_mux_desc *desc) +{ + return ERR_PTR(-EOPNOTSUPP); +} +static inline void typec_mux_unregister(struct typec_mux_dev *mux) {} + +static inline void typec_mux_set_drvdata(struct typec_mux_dev *mux, void *data) {} +static inline void *typec_mux_get_drvdata(struct typec_mux_dev *mux) +{ + return ERR_PTR(-EOPNOTSUPP); +} + +#endif /* CONFIG_TYPEC */ + +static inline struct typec_mux * +typec_mux_get(struct device *dev, const struct typec_altmode_desc *desc) +{ + return fwnode_typec_mux_get(dev_fwnode(dev), desc); +} + #endif /* __USB_TYPEC_MUX */ -- 2.36.1.476.g0c4daa206d-goog
WARNING: multiple messages have this Message-ID (diff)
From: Prashant Malani <pmalani@chromium.org> To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: heikki.krogerus@linux.intel.com, "Andrzej Hajda" <andrzej.hajda@intel.com>, "Neil Armstrong" <narmstrong@baylibre.com>, "David Airlie" <airlied@linux.ie>, "open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>, "Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Sam Ravnborg" <sam@ravnborg.org>, "kernel test robot" <lkp@intel.com>, "Jernej Skrabec" <jernej.skrabec@gmail.com>, "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" <devicetree@vger.kernel.org>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Nícolas F . R . A . Prado" <nfraprado@collabora.com>, "Jonas Karlman" <jonas@kwiboo.se>, swboyd@chromium.org, "Pin-Yen Lin" <treapking@chromium.org>, "Rob Herring" <robh+dt@kernel.org>, "Maxime Ripard" <maxime@cerno.tech>, "Hsin-Yi Wang" <hsinyi@chromium.org>, "Xin Ji" <xji@analogixsemi.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Robert Foss" <robert.foss@linaro.org>, "Prashant Malani" <pmalani@chromium.org>, "José Expósito" <jose.exposito89@gmail.com> Subject: [PATCH v4 2/7] usb: typec: mux: Add CONFIG guards for functions Date: Wed, 15 Jun 2022 17:20:18 +0000 [thread overview] Message-ID: <20220615172129.1314056-3-pmalani@chromium.org> (raw) In-Reply-To: <20220615172129.1314056-1-pmalani@chromium.org> There are some drivers that can use the Type C mux API, but don't have to. Introduce CONFIG guards for the mux functions so that drivers can include the header file and not run into compilation errors on systems which don't have CONFIG_TYPEC enabled. When CONFIG_TYPEC is not enabled, the Type C mux functions will be stub versions of the original calls. Reported-by: kernel test robot <lkp@intel.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Signed-off-by: Prashant Malani <pmalani@chromium.org> --- Changes since v3: - No changes. Changes since v2: - Fix up return types for some of the stubs. Remove 1 unnecessary stub in the else condition. - Remove unnecessary IS_MODULE config guard. - Added Reviewed-by and Tested-by tags. Changes since v1: - Added static inline to stub functions. - Updated function signature of stub functions from "struct typec_mux" to "struct typec_mux_dev" in accordance with updates from commit 713fd49b430c ("usb: typec: mux: Introduce indirection") include/linux/usb/typec_mux.h | 44 ++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h index ee57781dcf28..9292f0e07846 100644 --- a/include/linux/usb/typec_mux.h +++ b/include/linux/usb/typec_mux.h @@ -58,17 +58,13 @@ struct typec_mux_desc { void *drvdata; }; +#if IS_ENABLED(CONFIG_TYPEC) + struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, const struct typec_altmode_desc *desc); void typec_mux_put(struct typec_mux *mux); int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state); -static inline struct typec_mux * -typec_mux_get(struct device *dev, const struct typec_altmode_desc *desc) -{ - return fwnode_typec_mux_get(dev_fwnode(dev), desc); -} - struct typec_mux_dev * typec_mux_register(struct device *parent, const struct typec_mux_desc *desc); void typec_mux_unregister(struct typec_mux_dev *mux); @@ -76,4 +72,40 @@ void typec_mux_unregister(struct typec_mux_dev *mux); void typec_mux_set_drvdata(struct typec_mux_dev *mux, void *data); void *typec_mux_get_drvdata(struct typec_mux_dev *mux); +#else + +static inline struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, + const struct typec_altmode_desc *desc) +{ + return NULL; +} + +static inline void typec_mux_put(struct typec_mux *mux) {} + +static inline int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) +{ + return 0; +} + +static inline struct typec_mux_dev * +typec_mux_register(struct device *parent, const struct typec_mux_desc *desc) +{ + return ERR_PTR(-EOPNOTSUPP); +} +static inline void typec_mux_unregister(struct typec_mux_dev *mux) {} + +static inline void typec_mux_set_drvdata(struct typec_mux_dev *mux, void *data) {} +static inline void *typec_mux_get_drvdata(struct typec_mux_dev *mux) +{ + return ERR_PTR(-EOPNOTSUPP); +} + +#endif /* CONFIG_TYPEC */ + +static inline struct typec_mux * +typec_mux_get(struct device *dev, const struct typec_altmode_desc *desc) +{ + return fwnode_typec_mux_get(dev_fwnode(dev), desc); +} + #endif /* __USB_TYPEC_MUX */ -- 2.36.1.476.g0c4daa206d-goog
next prev parent reply other threads:[~2022-06-15 17:24 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-15 17:20 [PATCH v4 0/7] usb: typec: Introduce typec-switch binding Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 1/7] usb: typec: mux: Allow muxes to specify mode-switch Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` Prashant Malani [this message] 2022-06-15 17:20 ` [PATCH v4 2/7] usb: typec: mux: Add CONFIG guards for functions Prashant Malani 2022-06-16 6:22 ` Heikki Krogerus 2022-06-16 6:22 ` Heikki Krogerus 2022-06-15 17:20 ` [PATCH v4 3/7] dt-bindings: usb: Add Type-C switch binding Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-22 14:52 ` Krzysztof Kozlowski 2022-06-22 14:52 ` Krzysztof Kozlowski 2022-06-15 17:20 ` [PATCH v4 4/7] dt-bindings: drm/bridge: anx7625: Add mode-switch support Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:51 ` Krzysztof Kozlowski 2022-06-15 17:51 ` Krzysztof Kozlowski 2022-06-16 7:42 ` Stephen Boyd 2022-06-16 7:42 ` Stephen Boyd 2022-06-16 8:54 ` Prashant Malani 2022-06-16 8:54 ` Prashant Malani 2022-06-16 19:34 ` Rob Herring 2022-06-16 19:34 ` Rob Herring 2022-06-16 19:57 ` Prashant Malani 2022-06-16 19:57 ` Prashant Malani 2022-06-21 21:12 ` Prashant Malani 2022-06-21 21:12 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 5/7] drm/bridge: anx7625: Register number of Type C switches Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 6/7] drm/bridge: anx7625: Register Type-C mode switches Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 7/7] drm/bridge: anx7625: Add typec_mux_set callback function Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 18:13 ` [PATCH v4 0/7] usb: typec: Introduce typec-switch binding Prashant Malani 2022-06-15 18:13 ` Prashant Malani 2022-06-21 13:17 ` Greg Kroah-Hartman 2022-06-21 13:17 ` Greg Kroah-Hartman 2022-06-22 14:53 ` Krzysztof Kozlowski 2022-06-22 14:53 ` Krzysztof Kozlowski 2022-06-22 15:11 ` Greg Kroah-Hartman 2022-06-22 15:11 ` Greg Kroah-Hartman 2022-06-22 17:52 ` Prashant Malani 2022-06-22 17:52 ` Prashant Malani 2022-06-16 8:55 ` AngeloGioacchino Del Regno 2022-06-16 8:55 ` AngeloGioacchino Del Regno
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220615172129.1314056-3-pmalani@chromium.org \ --to=pmalani@chromium.org \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=airlied@linux.ie \ --cc=andrzej.hajda@intel.com \ --cc=bleung@chromium.org \ --cc=daniel@ffwll.ch \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=heikki.krogerus@linux.intel.com \ --cc=hsinyi@chromium.org \ --cc=jernej.skrabec@gmail.com \ --cc=jonas@kwiboo.se \ --cc=jose.exposito89@gmail.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=lkp@intel.com \ --cc=maxime@cerno.tech \ --cc=narmstrong@baylibre.com \ --cc=nfraprado@collabora.com \ --cc=robert.foss@linaro.org \ --cc=robh+dt@kernel.org \ --cc=sam@ravnborg.org \ --cc=swboyd@chromium.org \ --cc=treapking@chromium.org \ --cc=tzimmermann@suse.de \ --cc=xji@analogixsemi.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.