[PATCH 2/3] musb_hdrc: Clean-up MUSB init code for next merge window

public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed

From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Cc: Felipe Balbi <felipe.balbi@nokia.com>,
	David Brownell <dbrownell@users.sourceforge.net>
Subject: [PATCH 2/3] musb_hdrc: Clean-up MUSB init code for next merge window
Date: Thu, 12 Feb 2009 11:17:08 -0800	[thread overview]
Message-ID: <20090212191707.19766.23783.stgit@localhost> (raw)
In-Reply-To: <20090212191408.19766.62874.stgit@localhost>

Let's just use mach/usb.h as mach/musb.h only has one entry.

Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-2430sdp.c        |    2 +-
 arch/arm/mach-omap2/board-3430sdp.c        |    2 +-
 arch/arm/mach-omap2/board-ldp.c            |    2 +-
 arch/arm/mach-omap2/board-omap3beagle.c    |    2 +-
 arch/arm/mach-omap2/board-omap3evm.c       |    2 +-
 arch/arm/mach-omap2/board-omap3pandora.c   |    2 +-
 arch/arm/mach-omap2/board-overo.c          |    2 +-
 arch/arm/mach-omap2/board-rx51.c           |    2 +-
 arch/arm/plat-omap/include/mach/usb-musb.h |   35 ----------------------------
 arch/arm/plat-omap/include/mach/usb.h      |    4 ++-
 10 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 arch/arm/plat-omap/include/mach/usb-musb.h

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index cc65b1a..aa5df72 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -36,7 +36,7 @@
 #include <mach/gpio.h>
 #include <mach/mux.h>
 #include <mach/board.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 #include <mach/common.h>
 #include <mach/gpmc.h>
 #include <mach/mcspi.h>
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 8a0dba6..10be03e 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -34,7 +34,7 @@
 #include <mach/gpio.h>
 #include <mach/mux.h>
 #include <mach/board.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 #include <mach/usb-ehci.h>
 #include <mach/common.h>
 #include <mach/dma.h>
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 73c4504..1e1fd84 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -35,7 +35,7 @@
 #include <mach/board.h>
 #include <mach/common.h>
 #include <mach/gpmc.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 
 #include <asm/io.h>
 #include <asm/delay.h>
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 64c76bd..64fc613 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -38,7 +38,7 @@
 #include <asm/mach/flash.h>
 
 #include <mach/board.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 #include <mach/usb-ehci.h>
 #include <mach/common.h>
 #include <mach/gpmc.h>
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 775a1f3..4946463 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -31,7 +31,7 @@
 
 #include <mach/gpio.h>
 #include <mach/board.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 #include <mach/usb-ehci.h>
 #include <mach/common.h>
 #include <mach/mcspi.h>
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 2637641..cd90bf4 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -45,7 +45,7 @@
 #include <mach/hardware.h>
 #include <mach/nand.h>
 #include <mach/usb-ehci.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 #include <mach/mcspi.h>
 
 #include "sdram-micron-mt46h32m32lf-6.h"
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index c95b890..f600f70 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -46,7 +46,7 @@
 #include <mach/hardware.h>
 #include <mach/nand.h>
 #include <mach/usb-ehci.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 
 #include "sdram-micron-mt46h32m32lf-6.h"
 #include "twl4030-generic-scripts.h"
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index e845aac..98dfde1 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -28,7 +28,7 @@
 #include <mach/keypad.h>
 #include <mach/dma.h>
 #include <mach/gpmc.h>
-#include <mach/usb-musb.h>
+#include <mach/usb.h>
 
 #include <asm/io.h>
 #include <asm/delay.h>
diff --git a/arch/arm/plat-omap/include/mach/usb-musb.h b/arch/arm/plat-omap/include/mach/usb-musb.h
deleted file mode 100644
index b455b29..0000000
--- a/arch/arm/plat-omap/include/mach/usb-musb.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/usb-musb.h
- *
- * Hardware definitions for Mentor Graphics MUSBMHDRC.
- *
- * Initial creation by Felipe Balbi.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __ASM_ARCH_OMAP_USB_MUSB_H
-#define __ASM_ARCH_OMAP_USB_MUSB_H
-
-extern void usb_musb_init(void);
-
-#endif /* __ASM_ARCH_OMAP_USB_MUSB_H */
-
diff --git a/arch/arm/plat-omap/include/mach/usb.h b/arch/arm/plat-omap/include/mach/usb.h
index e078155..7d7b2b0 100644
--- a/arch/arm/plat-omap/include/mach/usb.h
+++ b/arch/arm/plat-omap/include/mach/usb.h
@@ -27,8 +27,8 @@
 #define UDC_BASE			OMAP2_UDC_BASE
 #define OMAP_OHCI_BASE			OMAP2_OHCI_BASE
 
-void __init usb_musb_init(void);
-void __init usb_ehci_init(void);
+extern void usb_musb_init(void);
+extern void usb_ehci_init(void);
 
 #endif

next prev parent reply	other threads:[~2009-02-12 19:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-12 19:16 [PATCH 0/3] musb_hdrc: Clean-up init code for mainline merge Tony Lindgren
2009-02-12 19:16 ` [PATCH 1/3] musb_hdrc: Set musb_resources dynamically Tony Lindgren
2009-02-12 19:28   ` Felipe Balbi
2009-02-12 19:17 ` Tony Lindgren [this message]
2009-02-12 19:30   ` [PATCH 2/3] musb_hdrc: Clean-up MUSB init code for next merge window Felipe Balbi
2009-02-12 19:44     ` Tony Lindgren
2009-02-12 19:17 ` [PATCH 3/3] musb_hdrc: Build usb-musb based on config entry, clean-up Makefile Tony Lindgren
2009-02-12 19:31   ` Felipe Balbi
2009-02-12 19:21 ` [PATCH 0/3] musb_hdrc: Clean-up init code for mainline merge Tony Lindgren
2009-02-12 19:35   ` Felipe Balbi
2009-02-13 20:50   ` David Brownell
2009-02-12 20:49 ` David Brownell

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:cc65b1a dfblob:aa5df72 dfblob:8a0dba6 dfblob:10be03e
dfblob:73c4504 dfblob:1e1fd84 dfblob:64c76bd dfblob:64fc613
dfblob:775a1f3 dfblob:4946463 dfblob:2637641 dfblob:cd90bf4
dfblob:c95b890 dfblob:f600f70 dfblob:e845aac dfblob:98dfde1
dfblob:b455b29 dfblob:e078155 dfblob:7d7b2b0 )
 OR (
bs:"[PATCH 2/3] musb_hdrc: Clean-up MUSB init code for next merge window" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090212191707.19766.23783.stgit@localhost \
    --to=tony@atomide.com \
    --cc=dbrownell@users.sourceforge.net \
    --cc=felipe.balbi@nokia.com \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox