From patchwork Tue Oct 22 21:39:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 285499 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 7ADC72C00CA for ; Wed, 23 Oct 2013 08:40:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 74F044A164; Tue, 22 Oct 2013 23:40:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tIRkrBbJHgtC; Tue, 22 Oct 2013 23:40:27 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5B0D24A157; Tue, 22 Oct 2013 23:40:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F5D14A157 for ; Tue, 22 Oct 2013 23:40:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q7lHJiF0xbht for ; Tue, 22 Oct 2013 23:39:59 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by theia.denx.de (Postfix) with ESMTPS id 0CFC44A156 for ; Tue, 22 Oct 2013 23:39:44 +0200 (CEST) Received: by mail-pd0-f173.google.com with SMTP id r10so7542346pdi.32 for ; Tue, 22 Oct 2013 14:39:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=e0lC5us3V6YGtEBrAvswcDOBnecVya5V3p9lDhsHsEQ=; b=OWb/SIj3KhHehMm4l7BuuanmGEw5NSbKAo1y3GOyy1Ui1L73AcVVFEF7kY97gaXXV3 McgdG5yoyQkkzoSbuOS8mbffZxTLexW+TwuPHm8vsUobdWewzN6xIIGJua0Z2zifY28l SQfAUulWpwU7KEHS0Ps1MnKAu1x2912tnvzUDotv/amNzxlDJPFjdXsCx0V75rSrGf7B as+HXQunNws8viKhghIuW1lURVuKqPiaChGjCs21A71CIbtcDVPpu8WqapJ70TdorFXR dNtaGjFRCaCoJdRA69ZQhPER16KwPGzeihLDnUs6sEYBrHUSvYB63Fm9gcqV6XuyfIq2 rurg== X-Gm-Message-State: ALoCoQns7LYR7IbeWKeIQw9M7jSa1nGi9DBxoy8/E4kDydjvnd3+tlgLF+KtRP4nMK/7OHZUTjpj X-Received: by 10.68.225.9 with SMTP id rg9mr25184917pbc.122.1382477982988; Tue, 22 Oct 2013 14:39:42 -0700 (PDT) Received: from officeserver-2 (97-117-169-108.phnx.qwest.net. [97.117.169.108]) by mx.google.com with ESMTPSA id zq10sm35958582pab.6.2013.10.22.14.39.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 22 Oct 2013 14:39:42 -0700 (PDT) Received: from tkisky by officeserver-2 with local (Exim 4.80) (envelope-from ) id 1VYjfj-0002qm-65; Tue, 22 Oct 2013 14:39:27 -0700 From: Troy Kisky To: trini@ti.com, marek.vasut@gmail.com Date: Tue, 22 Oct 2013 14:39:25 -0700 Message-Id: <1382477965-10925-1-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/1] usb: rename board_usb_init_type to usb_init_type X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de commit bba679144d25b91bcd7befff5a96728a30875f54 "usb: rename board_usb_init_type to usb_init_type" missed xhci-omap.c So, fix that patch here, and fix a checkpatch warning. WARNING: Avoid unnecessary line continuations Signed-off-by: Troy Kisky --- board/ti/omap5_uevm/evm.c | 2 +- drivers/usb/host/xhci-omap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 9458104..bb3a699 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -221,7 +221,7 @@ void usb_hub_reset_devices(int port) * * @return 0 */ -int board_usb_init(int index, enum board_usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { int ret; #ifdef CONFIG_PALMAS_USB_SS_PWR diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index f6099ac..e667810 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -27,11 +27,11 @@ DECLARE_GLOBAL_DATA_PTR; static struct omap_xhci omap; -inline int __board_usb_init(int index, enum board_usb_init_type init) +inline int __board_usb_init(int index, enum usb_init_type init) { return 0; } -int board_usb_init(int index, enum board_usb_init_type init) \ +int board_usb_init(int index, enum usb_init_type init) __attribute__((weak, alias("__board_usb_init"))); static void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode)