mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Robert Jarzmik <robert.jarzmik@free.fr>
To: barebox@lists.infradead.org
Subject: [PATCH] fixup! net: smc1111: add 16 bits accessors, allow address shift
Date: Tue,  3 Feb 2015 20:25:50 +0100	[thread overview]
Message-ID: <1422991551-12958-1-git-send-email-robert.jarzmik@free.fr> (raw)
In-Reply-To: <20150203083526.GH12209@pengutronix.de>

---
 drivers/net/smc91111.c | 17 ++++++++++++++---
 include/net/smc91111.h | 12 ------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 79a094d..698c74a 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -434,9 +434,20 @@
 */
 #define MEMORY_WAIT_TIME 16
 
+struct accessors {
+	void (*ob)(unsigned, void __iomem *, unsigned, unsigned);
+	void (*ow)(unsigned, void __iomem *, unsigned, unsigned);
+	void (*ol)(unsigned long, void __iomem *, unsigned, unsigned);
+	void (*osl)(void __iomem *, unsigned, const void  *, int, unsigned);
+	unsigned (*ib)(void __iomem *, unsigned, unsigned);
+	unsigned (*iw)(void __iomem *, unsigned, unsigned);
+	unsigned long (*il)(void __iomem *, unsigned, unsigned);
+	void (*isl)(void __iomem *, unsigned, void*, int, unsigned);
+};
+
 struct smc91c111_priv {
 	struct mii_bus miibus;
-	struct smc91111_accessors a;
+	struct accessors a;
 	void __iomem *base;
 	int qemu_fixup;
 	unsigned shift;
@@ -549,7 +560,7 @@ static inline void a32_insl(void __iomem *base, unsigned int offset, void *data,
 	readsl(base + (offset << shift), data, count);
 }
 
-static const struct smc91111_accessors access_via_16bit = {
+static const struct accessors access_via_16bit = {
 	.ob = a8_outb,
 	.ow = a16_outw,
 	.ol = a16_outl,
@@ -561,7 +572,7 @@ static const struct smc91111_accessors access_via_16bit = {
 };
 
 /* access happens via a 32 bit bus */
-static const struct smc91111_accessors access_via_32bit = {
+static const struct accessors access_via_32bit = {
 	.ob = a8_outb,
 	.ow = a16_outw,
 	.ol = a32_outl,
diff --git a/include/net/smc91111.h b/include/net/smc91111.h
index 0ed65e7..ba9da0b 100644
--- a/include/net/smc91111.h
+++ b/include/net/smc91111.h
@@ -7,18 +7,6 @@
 #ifndef __SMC91111_H__
 #define __SMC91111_H__
 
-struct smc91111_accessors {
-	void (*ob)(unsigned, void __iomem *, unsigned, unsigned);
-	void (*ow)(unsigned, void __iomem *, unsigned, unsigned);
-	void (*ol)(unsigned long, void __iomem *, unsigned, unsigned);
-	void (*osl)(void __iomem *, unsigned, const void  *, int, unsigned);
-	unsigned (*ib)(void __iomem *, unsigned, unsigned);
-	unsigned (*iw)(void __iomem *, unsigned, unsigned);
-	unsigned long (*il)(void __iomem *, unsigned, unsigned);
-	void (*isl)(void __iomem *, unsigned, void*, int, unsigned);
-	void *private;
-};
-
 struct smc91c111_pdata {
 	int qemu_fixup;
 	int addr_shift;
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2015-02-03 19:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-31 13:10 [PATCH v2 1/3] " Robert Jarzmik
2015-01-31 13:10 ` [PATCH v2 2/3] net: smc1111: extend the driver for 91c94 and 91c96 support Robert Jarzmik
2015-01-31 13:10 ` [PATCH v2 3/3] net: smc1111: improve debug capability Robert Jarzmik
2015-02-02  9:17 ` [PATCH v2 1/3] net: smc1111: add 16 bits accessors, allow address shift Sascha Hauer
2015-02-02 18:56   ` Robert Jarzmik
2015-02-03  8:35     ` Sascha Hauer
2015-02-03 19:25       ` Robert Jarzmik [this message]
2015-02-04 11:53         ` [PATCH] fixup! " 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=1422991551-12958-1-git-send-email-robert.jarzmik@free.fr \
    --to=robert.jarzmik@free.fr \
    --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