From: Tom Rini Date: Fri, 17 Apr 2015 18:43:39 -0400 Subject: [U-Boot] [PATCH] dm: usb: Make usb_lowlevel_init set the default ops pointer In-Reply-To: References: <1429302664-20996-1-git-send-email-trini@konsulko.com> <20150417220217.GN16702@bill-the-cat> Message-ID: <20150417224339.GO16702@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Fri, Apr 17, 2015 at 04:38:19PM -0600, Simon Glass wrote: > Hi Tom. > > On 17 April 2015 at 16:02, Tom Rini wrote: > > On Fri, Apr 17, 2015 at 03:28:30PM -0600, Simon Glass wrote: > >> Hi Tom, > >> > >> On 17 April 2015 at 14:31, Tom Rini wrote: > >> > In order to switch to a set of function pointers for certain operations > >> > we need to ensure that the defaults are first set so that they can be > >> > overriden as needed by SoC/board specific code. > >> > > >> > Signed-off-by: Tom Rini > >> > --- > >> > drivers/usb/host/ehci-hcd.c | 10 +++++++--- > >> > 1 file changed, 7 insertions(+), 3 deletions(-) > >> > > >> > diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c > >> > index 79cf3b3..e7c438c 100644 > >> > --- a/drivers/usb/host/ehci-hcd.c > >> > +++ b/drivers/usb/host/ehci-hcd.c > >> > @@ -945,9 +945,7 @@ const struct ehci_ops default_ehci_ops = { > >> > > >> > static void ehci_setup_ops(struct ehci_ctrl *ctrl, const struct ehci_ops *ops) > >> > { > >> > - if (!ops) { > >> > - ctrl->ops = default_ehci_ops; > >> > - } else { > >> > >> Do we need to remove this? I think this will break when driver model > >> is used, if NULL is passed in to select the default ops. > > > > Nope, just cleaning up the code as-is. > > I'm missing something though. For ehci_register() it calls this will > ops possibly equal to NULL, expecting it to set up the ops. OK, I missed a case too then, drop this hunk when you squash it in :) -- Tom