mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v3 07/13] sandbox: hostfile: move fd from platform data to priv
Date: Tue,  3 Mar 2015 13:14:53 +0100	[thread overview]
Message-ID: <1425384899-18809-8-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1425384899-18809-1-git-send-email-mkl@pengutronix.de>

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/sandbox/board/hostfile.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c
index fef9f5cffa89..103bcd9badc7 100644
--- a/arch/sandbox/board/hostfile.c
+++ b/arch/sandbox/board/hostfile.c
@@ -28,12 +28,13 @@
 
 struct hf_priv {
 	struct cdev cdev;
+	int fd;
 };
 
 static ssize_t hf_read(struct cdev *cdev, void *buf, size_t count, loff_t offset, ulong flags)
 {
-	struct hf_platform_data *hf = cdev->priv;
-	int fd = hf->fd;
+	struct hf_priv *priv= cdev->priv;
+	int fd = priv->fd;
 
 	if (linux_lseek(fd, offset) != offset)
 		return -EINVAL;
@@ -43,8 +44,8 @@ static ssize_t hf_read(struct cdev *cdev, void *buf, size_t count, loff_t offset
 
 static ssize_t hf_write(struct cdev *cdev, const void *buf, size_t count, loff_t offset, ulong flags)
 {
-	struct hf_platform_data *hf = cdev->priv;
-	int fd = hf->fd;
+	struct hf_priv *priv = cdev->priv;
+	int fd = priv->fd;
 
 	if (linux_lseek(fd, offset) != offset)
 		return -EINVAL;
@@ -70,11 +71,12 @@ static int hf_probe(struct device_d *dev)
 	struct hf_platform_data *hf = dev->platform_data;
 	struct hf_priv *priv = xzalloc(sizeof(*priv));
 
+	priv->fd = hf->fd;
 	priv->cdev.name = hf->devname;
 	priv->cdev.size = hf->size;
 	priv->cdev.dev = dev;
 	priv->cdev.ops = &hf_fops;
-	priv->cdev.priv = hf;
+	priv->cdev.priv = priv;
 
 	dev->info = hf_info;
 
-- 
2.1.4


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

  parent reply	other threads:[~2015-03-03 12:15 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-03 12:14 [PATCH v3 00/13] sandbox OF integration Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 01/13] sandbox: add support to pass dtb to barebox Marc Kleine-Budde
2015-03-03 20:43   ` Sascha Hauer
2015-03-03 21:41     ` Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 02/13] sandbox: add sample dts Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 03/13] sandbox: activate OF support in defconfig Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 04/13] sandbox: hostfile: clarify variable names Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 05/13] sandbox: hostfile: probe(): add missing pointer from cdev.dev to dev Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 06/13] sandbox: hostfile: remove struct hf_platform_data from hf_priv Marc Kleine-Budde
2015-03-03 12:14 ` Marc Kleine-Budde [this message]
2015-03-03 12:14 ` [PATCH v3 08/13] sandbox: hostfile: probe driver earlier Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 09/13] sandbox: hostfile: use the memory resource to determine the size not the platform_data Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 10/13] sandbox: hostfile: is always mmpad'ed Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 11/13] sandbox: move device name generation for image/env into add_image() Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 12/13] sandbox: hostfile: improve --image parameter to support "dev=file" Marc Kleine-Budde
2015-03-03 12:14 ` [PATCH v3 13/13] sandbox: hostfile: completely switch to OF based probing Marc Kleine-Budde
2015-03-04 10:35 ` [PATCH v3 00/13] sandbox OF integration 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=1425384899-18809-8-git-send-email-mkl@pengutronix.de \
    --to=mkl@pengutronix.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