zio_device: incompatible change private_data become priv_d

Signed-off-by: Federico Vaga <federico.vaga@gmail.com> Acked-by: Alessandro Rubini <rubini@gnudd.com>

zio_device: incompatible change private_data become priv_d
Signed-off-by: Federico Vaga <federico.vaga@gmail.com> Acked-by: Alessandro Rubini <rubini@gnudd.com>
9b44fe51 · Federico Vaga · d442ef9f · 9b44fe51 · 9b44fe51 · 9b44fe51
Commit 9b44fe51 authored May 03, 2012 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

zio-ad788x.c drivers/zio-ad788x.c +5 -5

zio.h include/linux/zio.h +1 -1

zio-sys.c zio-sys.c +1 -1

No files found.
--- a/drivers/zio-ad788x.c
+++ b/drivers/zio-ad788x.c
@@ -86,7 +86,7 @@ static int ad788x_conf_set(struct device *dev, struct zio_attribute *zattr,
 	unsigned long mask = zattr->priv.addr;
 	struct ad788x *ad788x;

-	ad788x = to_zio_dev(dev)->private_data;
+	ad788x = to_zio_dev(dev)->priv_d;
 	switch (mask) {
 	case AD788x_PM_ADDR:		/* power management */
 		if (usr_val < 4)
@@ -145,7 +145,7 @@ static int ad788x_input_cset(struct zio_cset *cset)
 	if (!context)
 		return -ENOMEM;

-	ad788x = cset->zdev->private_data;
+	ad788x = cset->zdev->priv_d;
 	context->chan_enable = __get_n_chan_enabled(cset);

 	/* prepare SPI message and transfer */
@@ -244,7 +244,7 @@ static int ad788x_zio_probe(struct zio_device *zdev)
 	int vshift;

 	pr_info("%s:%d\n", __func__, __LINE__);
-	ad788x = zdev->private_data;
+	ad788x = zdev->priv_d;
 	zattr_set = &zdev->zattr_set;
 	ad788x->zdev = zdev;

@@ -298,7 +298,7 @@ static int __devinit ad788x_spi_probe(struct spi_device *spi)

 	/* zdev here is the generic device */
 	zdev = zio_allocate_device();
-	zdev->private_data = ad788x;
+	zdev->priv_d = ad788x;
 	zdev->owner = THIS_MODULE;
 	spi_set_drvdata(spi, zdev);

@@ -318,7 +318,7 @@ static int __devexit ad788x_spi_remove(struct spi_device *spi)

 	/* zdev here is the generic device */
 	zdev = spi_get_drvdata(spi);
-	ad788x = zdev->private_data;
+	ad788x = zdev->priv_d;
 	zio_unregister_device(zdev);
 	kfree(ad788x);
 	zio_free_device(zdev);

--- a/include/linux/zio.h
+++ b/include/linux/zio.h
@@ -149,7 +149,7 @@ struct zio_device {
 	/* We can state what its preferred buffer and trigger are (NULL ok) */
 	char *preferred_buffer;
 	char *preferred_trigger;
-	void *private_data;
+	void *priv_d;
 };
 struct zio_device *zio_allocate_device(void);
 void zio_free_device(struct zio_device *dev);

--- a/zio-sys.c
+++ b/zio-sys.c
@@ -2005,7 +2005,7 @@ static int __zdev_register(struct zio_device *parent,
 	tmpl = id->template;

 	spin_lock_init(&zdev->lock);
-	zdev->private_data = parent->private_data;
+	zdev->priv_d = parent->priv_d;
 	zdev->head.zobj_type = ZDEV;
 	zdev->head.dev.parent = &parent->head.dev;
 	zdev->head.dev.type = &zobj_device_type;