lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 274/365] usb: typec: mux: Add CONFIG guards for functions
    Date
    From: Prashant Malani <pmalani@chromium.org>

    [ Upstream commit a37599ebfb656c2af4ca119de556eba29b6926d6 ]

    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>
    Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
    Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
    Signed-off-by: Prashant Malani <pmalani@chromium.org>
    Link: https://lore.kernel.org/r/20220615172129.1314056-3-pmalani@chromium.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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.35.1


    \
     
     \ /
      Last update: 2022-08-23 11:14    [W:4.138 / U:0.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site