From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
"K V, Abhilash" <abhilash.k.v@intel.com>,
Guenter Roeck <linux@roeck-us.net>, Ajay Gupta <ajayg@nvidia.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usb: typec: ucsi: fix ucsi_register_port_psy typo
Date: Wed, 29 Apr 2020 11:31:23 +0200 [thread overview]
Message-ID: <20200429093123.GB2079263@kroah.com> (raw)
In-Reply-To: <20200429085211.2879411-1-arnd@arndb.de>
On Wed, Apr 29, 2020 at 10:52:04AM +0200, Arnd Bergmann wrote:
> The dummy function in the header file has the wrong name,
> conflicting with a local ucsi_register_port function:
>
> drivers/usb/typec/ucsi/ucsi.c:890:12: error: conflicting types for 'ucsi_register_port'
> 890 | static int ucsi_register_port(struct ucsi *ucsi, int index)
> | ^~~~~~~~~~~~~~~~~~
> In file included from drivers/usb/typec/ucsi/ucsi.c:17:
> drivers/usb/typec/ucsi/ucsi.h:344:19: note: previous definition of 'ucsi_register_port' was here
> 344 | static inline int ucsi_register_port(struct ucsi_connector *con) { return 0; }
> | ^~~~~~~~~~~~~~~~~~
> drivers/usb/typec/ucsi/ucsi.c: In function 'ucsi_register_port':
> drivers/usb/typec/ucsi/ucsi.c:939:8: error: implicit declaration of function 'ucsi_register_port_psy'; did you mean 'ucsi_unregister_port_psy'? [-Werror=implicit-function-declaration]
> 939 | ret = ucsi_register_port_psy(con);
> | ^~~~~~~~~~~~~~~~~~~~~~
> | ucsi_unregister_port_psy
>
> Fixes: 992a60ed0d5e ("usb: typec: ucsi: register with power_supply class")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/usb/typec/ucsi/ucsi.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
> index e52b5540b254..cba6f77bea61 100644
> --- a/drivers/usb/typec/ucsi/ucsi.h
> +++ b/drivers/usb/typec/ucsi/ucsi.h
> @@ -341,7 +341,7 @@ int ucsi_resume(struct ucsi *ucsi);
> int ucsi_register_port_psy(struct ucsi_connector *con);
> void ucsi_unregister_port_psy(struct ucsi_connector *con);
> #else
> -static inline int ucsi_register_port(struct ucsi_connector *con) { return 0; }
> +static inline int ucsi_register_port_psy(struct ucsi_connector *con) { return 0; }
> static inline void ucsi_unregister_port_psy(struct ucsi_connector *con) { }
> #endif /* CONFIG_POWER_SUPPLY */
>
> --
> 2.26.0
>
This was sent yesterday and will show up in the next linux-next release,
sorry for the delay.
greg k-h
prev parent reply other threads:[~2020-04-29 9:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 8:52 [PATCH] usb: typec: ucsi: fix ucsi_register_port_psy typo Arnd Bergmann
2020-04-29 9:31 ` Greg Kroah-Hartman [this message]
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=20200429093123.GB2079263@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=abhilash.k.v@intel.com \
--cc=ajayg@nvidia.com \
--cc=arnd@arndb.de \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
/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: link
Be 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.