From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 05 Oct 2012 18:26:36 +0200 (CEST) Received: from zmc.proxad.net ([212.27.53.206]:37117 "EHLO zmc.proxad.net" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6870352Ab2JEQXrHeOr5 (ORCPT ); Fri, 5 Oct 2012 18:23:47 +0200 Received: from localhost (localhost [127.0.0.1]) by zmc.proxad.net (Postfix) with ESMTP id CF19BA3026A; Fri, 5 Oct 2012 18:23:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at localhost Received: from zmc.proxad.net ([127.0.0.1]) by localhost (zmc.proxad.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 06yKHA-3nubJ; Fri, 5 Oct 2012 18:23:44 +0200 (CEST) Received: from flexo.iliad.local (freebox.vlq16.iliad.fr [213.36.7.13]) by zmc.proxad.net (Postfix) with ESMTPSA id 60881163F2D; Fri, 5 Oct 2012 18:23:44 +0200 (CEST) From: Florian Fainelli To: stern@rowland.harvard.edu Cc: linux-usb@vger.kernel.org, Florian Fainelli , Ralf Baechle , Greg Kroah-Hartman , Manuel Lauss , Hauke Mehrtens , Sarah Sharp , Felipe Balbi , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: [PATCH 26/32] USB: move common alchemy USB routines to arch/mips/alchemy/common.c Date: Fri, 5 Oct 2012 18:20:58 +0200 Message-Id: <1349454064-11606-27-git-send-email-florian@openwrt.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349454064-11606-1-git-send-email-florian@openwrt.org> References: <1349454064-11606-1-git-send-email-florian@openwrt.org> X-archive-position: 34636 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: florian@openwrt.org Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Return-Path: A previous patch converted the Alchemy platform to use the OHCI and EHCI platform drivers. As a result, all the common logic to handle USB present in drivers/usb/host/alchemy-common.c has no reason to remain here, so we move it to arch/mips/alchemy/common/usb.c which is a more appropriate place. This change was suggested by Manuel Lauss. Signed-off-by: Florian Fainelli --- arch/mips/alchemy/common/Makefile | 2 +- .../mips/alchemy/common/usb.c | 0 drivers/usb/host/Makefile | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%) diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile index 407ebc0..cb83d8d 100644 --- a/arch/mips/alchemy/common/Makefile +++ b/arch/mips/alchemy/common/Makefile @@ -6,7 +6,7 @@ # obj-y += prom.o time.o clocks.o platform.o power.o setup.o \ - sleeper.o dma.o dbdma.o vss.o irq.o + sleeper.o dma.o dbdma.o vss.o irq.o usb.o # optional gpiolib support ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),) diff --git a/drivers/usb/host/alchemy-common.c b/arch/mips/alchemy/common/usb.c similarity index 100% rename from drivers/usb/host/alchemy-common.c rename to arch/mips/alchemy/common/usb.c diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 9e0a89c..332ed89 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -40,6 +40,5 @@ obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o -obj-$(CONFIG_MIPS_ALCHEMY) += alchemy-common.o obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o -- 1.7.9.5