From: Milan Svoboda <msvoboda@ra.rockwell.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] usb gadget: clean udc.h
Date: Thu, 25 May 2006 09:22:27 +0200 [thread overview]
Message-ID: <44755B33.3080302@ra.rockwell.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
From: Milan Svoboda <msvoboda@ra.rockwell.com>
This patch deletes file udc.h in include/asm-arm/arch-pxa and
include/asm-arm/arch-ixp4xx
and creates the same file in include/asm-arm.
I'm not sure if this change is correct, but this header is same for
those two architectures
and it's used by pxa2xx_udc driver only. Do you have better ideas?
This patch is against 2.6.16.13 with previous patches applied.
Signed-off-by: Milan Svoboda <msvoboda@ra.rockwell.com>
---
[-- Attachment #2: beautify.patch --]
[-- Type: text/plain, Size: 3650 bytes --]
diff -urpN -X orig/Documentation/dontdiff orig/arch/arm/mach-ixp4xx/common.c new_gadget/arch/arm/mach-ixp4xx/common.c
--- orig/arch/arm/mach-ixp4xx/common.c 2006-05-15 14:45:52.000000000 +0000
+++ new_gadget/arch/arm/mach-ixp4xx/common.c 2006-05-15 15:17:15.000000000 +0000
@@ -34,13 +34,12 @@
#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/irq.h>
+#include <asm/udc.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
-#include <asm/arch/udc.h>
-
/*************************************************************************
* IXP4xx chipset I/O mapping
*************************************************************************/
diff -urpN -X orig/Documentation/dontdiff orig/drivers/usb/gadget/pxa2xx_udc.c new_gadget/drivers/usb/gadget/pxa2xx_udc.c
--- orig/drivers/usb/gadget/pxa2xx_udc.c 2006-05-15 14:45:52.000000000 +0000
+++ new_gadget/drivers/usb/gadget/pxa2xx_udc.c 2006-05-15 15:11:55.000000000 +0000
@@ -60,7 +60,7 @@
#include <linux/usb_ch9.h>
#include <linux/usb_gadget.h>
-#include <asm/arch/udc.h>
+#include <asm/udc.h>
/*
diff -urpN -X orig/Documentation/dontdiff orig/include/asm-arm/arch-ixp4xx/udc.h new_gadget/include/asm-arm/arch-ixp4xx/udc.h
--- orig/include/asm-arm/arch-ixp4xx/udc.h 2006-05-15 14:45:52.000000000 +0000
+++ new_gadget/include/asm-arm/arch-ixp4xx/udc.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-/*
- * linux/include/asm-arm/arch-pxa/udc.h
- *
- * This supports machine-specific differences in how the PXA2xx
- * USB Device Controller (UDC) is wired.
- *
- * It is set in linux/arch/arm/mach-pxa/<machine>.c and used in
- * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
- */
-struct pxa2xx_udc_mach_info {
- int (*udc_is_connected)(void); /* do we see host? */
- void (*udc_command)(int cmd);
-#define PXA2XX_UDC_CMD_CONNECT 0 /* let host see us */
-#define PXA2XX_UDC_CMD_DISCONNECT 1 /* so host won't see us */
-};
-
-extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
-
diff -urpN -X orig/Documentation/dontdiff orig/include/asm-arm/arch-pxa/udc.h new_gadget/include/asm-arm/arch-pxa/udc.h
--- orig/include/asm-arm/arch-pxa/udc.h 2005-03-02 07:38:17.000000000 +0000
+++ new_gadget/include/asm-arm/arch-pxa/udc.h 2006-05-15 15:13:26.000000000 +0000
@@ -1,18 +1,4 @@
-/*
- * linux/include/asm-arm/arch-pxa/udc.h
- *
- * This supports machine-specific differences in how the PXA2xx
- * USB Device Controller (UDC) is wired.
- *
- * It is set in linux/arch/arm/mach-pxa/<machine>.c and used in
- * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
- */
-struct pxa2xx_udc_mach_info {
- int (*udc_is_connected)(void); /* do we see host? */
- void (*udc_command)(int cmd);
-#define PXA2XX_UDC_CMD_CONNECT 0 /* let host see us */
-#define PXA2XX_UDC_CMD_DISCONNECT 1 /* so host won't see us */
-};
+#include <asm/udc.h>
extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
diff -urpN -X orig/Documentation/dontdiff orig/include/asm-arm/udc.h new_gadget/include/asm-arm/udc.h
--- orig/include/asm-arm/udc.h 1970-01-01 00:00:00.000000000 +0000
+++ new_gadget/include/asm-arm/udc.h 2006-05-15 15:12:43.000000000 +0000
@@ -0,0 +1,13 @@
+/*
+ * linux/include/asm-arm/udc.h
+ *
+ * This supports machine-specific differences in how the PXA2xx
+ * USB Device Controller (UDC) is wired.
+ *
+ */
+struct pxa2xx_udc_mach_info {
+ int (*udc_is_connected)(void); /* do we see host? */
+ void (*udc_command)(int cmd);
+#define PXA2XX_UDC_CMD_CONNECT 0 /* let host see us */
+#define PXA2XX_UDC_CMD_DISCONNECT 1 /* so host won't see us */
+};
reply other threads:[~2006-05-25 7:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=44755B33.3080302@ra.rockwell.com \
--to=msvoboda@ra.rockwell.com \
--cc=linux-kernel@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