From: Thierry Reding <thierry.reding@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>
Cc: Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
Thierry Reding <treding@nvidia.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nagarjuna Kristam <nkristam@nvidia.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>
Subject: Re: linux-next: build failure after merge of the usb tree
Date: Mon, 16 Mar 2020 12:30:12 +0100 [thread overview]
Message-ID: <20200316113012.GA3049021@ulmo> (raw)
In-Reply-To: <20200316141004.171649a5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2685 bytes --]
On Mon, Mar 16, 2020 at 02:10:04PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the usb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/phy/tegra/xusb.c: In function 'tegra_xusb_setup_usb_role_switch':
> drivers/phy/tegra/xusb.c:641:10: error: initialization of 'int (*)(struct usb_role_switch *, enum usb_role)' from incompatible pointer type 'int (*)(struct device *, enum usb_role)' [-Werror=incompatible-pointer-types]
> 641 | .set = tegra_xusb_role_sw_set,
> | ^~~~~~~~~~~~~~~~~~~~~~
> drivers/phy/tegra/xusb.c:641:10: note: (near initialization for 'role_sx_desc.set')
>
> Caused by commit
>
> bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
>
> interacting with commit
>
> 5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")
>
> from the tegra tree.
>
> I have added this merge fix patch (which may need more work):
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 16 Mar 2020 14:04:20 +1100
> Subject: [PATCH] phy: tegra: fix up for set_role API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/phy/tegra/xusb.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
> index d907f03bf282..25223c350e66 100644
> --- a/drivers/phy/tegra/xusb.c
> +++ b/drivers/phy/tegra/xusb.c
> @@ -596,11 +596,12 @@ static void tegra_xusb_usb_phy_work(struct work_struct *work)
> atomic_notifier_call_chain(&port->usb_phy.notifier, 0, &port->usb_phy);
> }
>
> -static int tegra_xusb_role_sw_set(struct device *dev, enum usb_role role)
> +static int tegra_xusb_role_sw_set(struct usb_role_switch *sw,
> + enum usb_role role)
> {
> - struct tegra_xusb_port *port = dev_get_drvdata(dev);
> + struct tegra_xusb_port *port = usb_role_switch_get_drvdata(sw);
>
> - dev_dbg(dev, "%s(): role %s\n", __func__, usb_roles[role]);
> + dev_dbg(&port->dev, "%s(): role %s\n", __func__, usb_roles[role]);
>
> schedule_work(&port->usb_phy_work);
>
> --
> 2.25.0
I can rebase the branch that contains this commit on top of Greg's USB
tree. These are a dependency for the UDC and host driver changes that I
have sent as a pull request to Greg, so this should all work out nicely.
Greg, I recall that you've said in the past that you don't rebase your
trees. Is that still the case for the USB tree? Do you have a preference
what to base my branch on? The earliest of your USB tree that contains
all patches needed to make this compile? Or the latest?
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-03-16 11:30 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 3:10 linux-next: build failure after merge of the usb tree Stephen Rothwell
2020-03-16 11:30 ` Thierry Reding [this message]
2020-03-16 13:28 ` Greg KH
2020-03-16 13:44 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2023-10-04 2:22 Stephen Rothwell
2023-10-04 6:43 ` Greg KH
2023-10-04 6:47 ` Rohit Agarwal
2023-10-04 12:46 ` Greg KH
2023-10-09 9:18 ` Rohit Agarwal
2023-10-09 9:48 ` Greg KH
2023-10-09 9:49 ` Dmitry Baryshkov
2023-10-12 17:03 ` Rohit Agarwal
2023-10-16 18:43 ` Greg KH
2023-03-27 5:02 Stephen Rothwell
2023-03-27 7:37 ` Greg KH
2022-11-30 2:18 Stephen Rothwell
2022-11-30 10:52 ` Greg KH
2022-11-30 10:58 ` Andy Shevchenko
2022-11-30 17:43 ` Andy Shevchenko
2022-11-30 17:46 ` Greg KH
2022-11-30 10:53 ` Andy Shevchenko
2022-07-18 6:31 Stephen Rothwell
2022-07-18 20:43 ` Greg KH
2022-07-18 21:41 ` Prashant Malani
2022-07-18 22:08 ` Prashant Malani
2022-07-19 6:50 ` Greg KH
2022-07-19 12:01 ` Greg KH
2022-07-19 17:11 ` Prashant Malani
2022-07-19 6:08 ` Stephen Rothwell
2022-06-14 2:08 Stephen Rothwell
2022-06-14 2:41 ` Neal Liu
2022-06-14 6:30 ` Stephen Rothwell
2022-06-14 6:41 ` Greg KH
2022-06-14 7:52 ` Stephen Rothwell
2022-06-14 8:10 ` Bagas Sanjaya
2022-06-14 9:28 ` Greg KH
2022-06-14 11:11 ` Stephen Rothwell
2022-05-02 11:07 Stephen Rothwell
2022-05-02 11:40 ` Greg KH
2022-05-02 17:09 ` Matthias Kaehlcke
2022-05-02 17:32 ` Greg KH
2022-05-02 17:49 ` Matthias Kaehlcke
2022-05-03 14:49 ` Greg KH
2021-04-12 11:36 Stephen Rothwell
2021-04-12 12:35 ` Greg KH
2021-04-12 12:41 ` Heikki Krogerus
2019-06-19 6:43 Stephen Rothwell
2019-06-19 14:56 ` Greg KH
2014-12-01 8:19 Stephen Rothwell
2014-12-02 18:12 ` Greg KH
2014-12-03 5:57 ` Kishon Vijay Abraham I
2014-07-24 7:07 Stephen Rothwell
2014-07-24 7:44 ` Greg KH
2014-08-06 1:39 ` Stephen Rothwell
2014-08-06 4:04 ` Greg KH
2014-05-29 9:01 Stephen Rothwell
2014-05-29 18:18 ` Greg KH
2014-05-29 18:40 ` Dan Williams
2013-04-18 6:05 Stephen Rothwell
2013-04-18 16:06 ` Joe Perches
2013-03-27 3:41 Stephen Rothwell
2013-03-27 3:51 ` Ming Lei
2013-03-27 4:20 ` Greg KH
2013-03-28 18:04 ` Greg KH
2013-01-28 10:46 Stephen Rothwell
2013-01-28 14:45 ` Greg KH
2013-01-28 14:50 ` Lan Tianyu
2013-01-28 15:28 ` Lan Tianyu
2013-01-28 16:03 ` Lan, Tianyu
2013-01-29 13:41 ` Greg KH
2013-01-29 13:51 ` Lan, Tianyu
2013-01-29 14:59 ` Greg KH
2013-01-21 4:21 Stephen Rothwell
2013-01-21 8:37 ` Lan, Tianyu
2012-09-19 4:31 Stephen Rothwell
2012-09-19 7:17 ` Greg KH
2012-09-19 13:59 ` Alan Cox
2012-09-19 14:13 ` Greg KH
2012-05-21 6:22 Stephen Rothwell
2012-05-21 12:56 ` Sarah Sharp
2012-04-27 4:12 Stephen Rothwell
2012-04-27 18:25 ` Greg KH
2010-11-17 2:14 Stephen Rothwell
2010-11-17 4:20 ` Greg KH
2010-11-17 15:56 ` Alan Stern
2010-11-17 21:25 ` Greg KH
2010-09-14 2:54 Stephen Rothwell
2010-09-14 4:03 ` Greg KH
2010-09-14 4:08 ` Greg KH
2010-09-14 4:25 ` Stephen Rothwell
2010-09-14 13:26 ` Greg KH
2010-09-15 13:21 ` Mihai Donțu
2010-09-02 3:54 Stephen Rothwell
2010-09-02 4:32 ` Greg KH
2010-09-02 4:36 ` Michał Nazarewicz
2010-09-02 4:51 ` Stephen Rothwell
2010-05-18 7:42 Stephen Rothwell
2010-05-18 13:54 ` Alan Stern
2010-05-18 14:08 ` Greg KH
2010-05-18 21:11 ` Greg KH
2010-05-19 22:49 ` Stephen Rothwell
2010-05-20 6:39 ` Greg KH
2010-05-18 14:00 ` Greg KH
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=20200316113012.GA3049021@ulmo \
--to=thierry.reding@gmail.com \
--cc=ccross@android.com \
--cc=greg@kroah.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nkristam@nvidia.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=treding@nvidia.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).