From: Christian Eggers <ceggers@arri.de>
To: barebox@lists.infradead.org
Cc: Christian Eggers <ceggers@arri.de>
Subject: [PATCH] usb: rename "struct usb_configuration" to "struct usb_config"
Date: Fri, 21 Feb 2020 11:11:11 +0100 [thread overview]
Message-ID: <20200221101111.14668-1-ceggers@arri.de> (raw)
struct usb_configuration in usb.h conflicts with struct
usb_configuration in usb/composite.h
The version in usb/composite.h is also defined in Linux, so rename the
other one.
Signed-off-by: Christian Eggers <ceggers@arri.de>
---
include/usb/usb.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/usb/usb.h b/include/usb/usb.h
index d39de71aff..4847a3de36 100644
--- a/include/usb/usb.h
+++ b/include/usb/usb.h
@@ -68,7 +68,7 @@ struct usb_interface {
struct usb_endpoint_descriptor ep_desc[USB_MAXENDPOINTS];
};
-struct usb_configuration {
+struct usb_config {
struct usb_config_descriptor desc;
unsigned char no_of_if; /* number of interfaces */
@@ -95,7 +95,7 @@ struct usb_device {
int configno; /* selected config number */
struct usb_device_descriptor *descriptor; /* Device Descriptor */
- struct usb_configuration config; /* config descriptor */
+ struct usb_config config; /* config descriptor */
struct devrequest *setup_packet;
int have_langid; /* whether string_langid is valid yet */
--
Christian Eggers
Embedded software developer
Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2020-02-21 10:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 10:11 Christian Eggers [this message]
2020-02-25 7:56 ` Sascha Hauer
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=20200221101111.14668-1-ceggers@arri.de \
--to=ceggers@arri.de \
--cc=barebox@lists.infradead.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