Re: [PATCH] s390: remove driver_data direct access of struct device

[Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>]

hi,

this patch introduces some build failures like:

drivers/s390/char/raw3270.c: In function 'raw3270_model_show':
drivers/s390/char/raw3270.c:1132: warning: dereferencing 'void *' pointer
drivers/s390/char/raw3270.c:1132: error: request for member 'model' in something not a structure or union

the following add-on patch fixes this

Regards,
Sebastian

Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
---
 drivers/s390/char/raw3270.c |    6 +++---
 drivers/s390/net/claw.c     |    2 +-
 drivers/s390/net/lcs.h      |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: git.linux-2.6/drivers/s390/char/raw3270.c
===================================================================
--- git.linux-2.6.orig/drivers/s390/char/raw3270.c	2009-05-05 12:20:23.000000000 +0200
+++ git.linux-2.6/drivers/s390/char/raw3270.c	2009-05-05 12:28:03.000000000 +0200
@@ -1129,7 +1129,7 @@ static ssize_t
 raw3270_model_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	return snprintf(buf, PAGE_SIZE, "%i\n",
-			((struct raw3270 *) dev_get_drvdata(dev)->model);
+			((struct raw3270 *) dev_get_drvdata(dev))->model);
 }
 static DEVICE_ATTR(model, 0444, raw3270_model_show, NULL);
 
@@ -1137,7 +1137,7 @@ static ssize_t
 raw3270_rows_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	return snprintf(buf, PAGE_SIZE, "%i\n",
-			((struct raw3270 *) dev_get_drvdata(dev)->rows);
+			((struct raw3270 *) dev_get_drvdata(dev))->rows);
 }
 static DEVICE_ATTR(rows, 0444, raw3270_rows_show, NULL);
 
@@ -1145,7 +1145,7 @@ static ssize_t
 raw3270_columns_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	return snprintf(buf, PAGE_SIZE, "%i\n",
-			((struct raw3270 *) dev_get_drvdata(dev)->cols);
+			((struct raw3270 *) dev_get_drvdata(dev))->cols);
 }
 static DEVICE_ATTR(columns, 0444, raw3270_columns_show, NULL);
 
Index: git.linux-2.6/drivers/s390/net/lcs.h
===================================================================
--- git.linux-2.6.orig/drivers/s390/net/lcs.h	2009-05-05 12:20:23.000000000 +0200
+++ git.linux-2.6/drivers/s390/net/lcs.h	2009-05-05 12:31:44.000000000 +0200
@@ -34,8 +34,8 @@ static inline int lcs_dbf_passes(debug_i
  *	sysfs related stuff
  */
 #define CARD_FROM_DEV(cdev) \
-	(struct lcs_card *) \
-	((struct ccwgroup_device *)dev_get_drvdata(&dev_get_drvdata(&cdev->dev)->dev);
+	(struct lcs_card *) dev_get_drvdata( \
+		&((struct ccwgroup_device *)dev_get_drvdata(&cdev->dev))->dev);
 /**
  * CCW commands used in this driver
  */
Index: git.linux-2.6/drivers/s390/net/claw.c
===================================================================
--- git.linux-2.6.orig/drivers/s390/net/claw.c	2009-05-05 12:20:23.000000000 +0200
+++ git.linux-2.6/drivers/s390/net/claw.c	2009-05-05 12:34:24.000000000 +0200
@@ -2919,7 +2919,7 @@ claw_new_device(struct ccwgroup_device *
 	CLAW_DBF_TEXT(2, setup, "new_dev");
 	privptr = dev_get_drvdata(&cgdev->dev);
 	dev_set_drvdata(&cgdev->cdev[READ]->dev, privptr);
-	dev_set_drvdata(&cgdev->cdev[WRITE]->dev,  privptr);
+	dev_set_drvdata(&cgdev->cdev[WRITE]->dev, privptr);
 	if (!privptr)
 		return -ENODEV;
 	p_env = privptr->p_env;
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html