Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756457AbcJZSKT (ORCPT ); Wed, 26 Oct 2016 14:10:19 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:34885 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755891AbcJZSKR (ORCPT ); Wed, 26 Oct 2016 14:10:17 -0400 From: Kirill Esipov To: linux-kernel@vger.kernel.org Cc: linux-usb@vger.kernel.org, gregkh@linuxfoundation.org, b-liu@ti.com, sergei.shtylyov@cogentembedded.com, Kirill Esipov Subject: [PATCH v4] usb: musb: remove duplicated actions Date: Wed, 26 Oct 2016 21:10:07 +0300 Message-Id: <1477505407-13459-1-git-send-email-yesipov@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 904 Lines: 26 Removing unnecessary duplicated actions that we've got while merging: 19915e623458 ("Merge 4.1-rc7 into usb-next") Signed-off-by: Kirill Esipov --- 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