Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754132AbcKATnd (ORCPT ); Tue, 1 Nov 2016 15:43:33 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:60719 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753076AbcKATnb (ORCPT ); Tue, 1 Nov 2016 15:43:31 -0400 Date: Tue, 1 Nov 2016 14:43:29 -0500 From: Bin Liu To: Kirill Esipov CC: , , , Subject: Re: [PATCH v4] usb: musb: remove duplicated actions Message-ID: <20161101194329.GC30087@uda0271908> Mail-Followup-To: Bin Liu , Kirill Esipov , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, gregkh@linuxfoundation.org, sergei.shtylyov@cogentembedded.com References: <1477505407-13459-1-git-send-email-yesipov@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1477505407-13459-1-git-send-email-yesipov@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1062 Lines: 36 Hi, On Wed, Oct 26, 2016 at 09:10:07PM +0300, Kirill Esipov wrote: > Removing unnecessary duplicated actions that we've got while merging: > 19915e623458 ("Merge 4.1-rc7 into usb-next") > > Signed-off-by: Kirill Esipov Applied. Thanks. Regards, -Bin. > --- > drivers/usb/musb/musb_core.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c > index 27dadc0..e01116e 100644 > --- a/drivers/usb/musb/musb_core.c > +++ b/drivers/usb/musb/musb_core.c > @@ -2114,11 +2114,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) > musb->io.ep_offset = musb_flat_ep_offset; > musb->io.ep_select = musb_flat_ep_select; > } > - /* And override them with platform specific ops if specified. */ > - if (musb->ops->ep_offset) > - musb->io.ep_offset = musb->ops->ep_offset; > - if (musb->ops->ep_select) > - musb->io.ep_select = musb->ops->ep_select; > > /* At least tusb6010 has its own offsets */ > if (musb->ops->ep_offset) > -- > 2.7.4 >