Skip to contentSkip to conversation

Replace driver_data with dev_[gs]et_drvdata()

PATCH New Richard Knutsson 1 participant 4 messages Dec 5, 2005

Subsystems (9)
Network drivers SCSI USB s390 +5 more subsystems
lore
Share & tools
lore
#0 lore raw

cover Replace driver_data with dev_[gs]et_drvdata()

This patch-set replaces (of those found):
target = dev->driver_data;
with
target = dev_get_drvdata(dev);

  dev->driver_data = target;
    with
  dev_set_drvdata(dev, target);

The net's and rest's patched files are compiled with no error (or warning regarding to the patch).

s390 is not compiled but checked several times and should not have any problems.

Any comment is dearly welcome ;)

/Richard Knutsson

#1 lore raw

PATCH 1/3 net: Replace driver_data with dev_[gs]et_drvdata

From: Richard Knutsson <[email protected]>

Replace (found) dev->driver_data with dev_[gs]et_drvdata() + ^L deletion.

---

 3c509.c            |    2 +-
 depca.c            |    2 +-
 dgrs.c             |    4 ++--
 hp100.c            |    4 ++--
 ne3210.c           |    4 ++--
 smc-mca.c          |    4 ++--
 tulip/de4x5.c      |    6 +++---
 wireless/ipw2100.c |    8 ++++----
 wireless/ipw2200.c |   46 +++++++++++++++++++++++-----------------------
 9 files changed, 40 insertions(+), 40 deletions(-)
drivers/net/3c509.c +1 -1
diff -Narup a/drivers/net/3c509.c b/drivers/net/3c509.c
@@ -744,7 +744,7 @@ static int __devexit el3_device_remove (
 {
 	struct net_device *dev;
 
-	dev  = device->driver_data;
+	dev = dev_get_drvdata(device);
 
 	el3_common_remove (dev);
 	return 0;
drivers/net/depca.c +1 -1
diff -Narup a/drivers/net/depca.c b/drivers/net/depca.c
@@ -1624,7 +1624,7 @@ static int __devexit depca_device_remove
 	struct depca_private *lp;
 	int bus;
 
-	dev  = device->driver_data;
+	dev  = dev_get_drvdata(device);
 	lp   = dev->priv;
 
 	unregister_netdev (dev);
drivers/net/dgrs.c +2 -2
diff -Narup a/drivers/net/dgrs.c b/drivers/net/dgrs.c
@@ -1494,7 +1494,7 @@ static int __init dgrs_eisa_probe (struc
 		goto err_out;
 	}
 
-	gendev->driver_data = dev;
+	dev_set_drvdata(gendev, dev);
 	return 0;
  err_out:
 	release_region(io, 256);
@@ -1503,7 +1503,7 @@ static int __init dgrs_eisa_probe (struc
 
 static int __devexit dgrs_eisa_remove(struct device *gendev)
 {
-	struct net_device *dev = gendev->driver_data;
+	struct net_device *dev = dev_get_drvdata(gendev);
 	
 	dgrs_remove(dev);
 
drivers/net/hp100.c +2 -2
diff -Narup a/drivers/net/hp100.c b/drivers/net/hp100.c
@@ -2869,7 +2869,7 @@ static int __init hp100_eisa_probe (stru
 	printk("hp100: %s: EISA adapter found at 0x%x\n", dev->name, 
 	       dev->base_addr);
 #endif
-	gendev->driver_data = dev;
+	dev_set_drvdata(gendev, dev);
 	return 0;
  out1:
 	free_netdev(dev);
@@ -2878,7 +2878,7 @@ static int __init hp100_eisa_probe (stru
 
 static int __devexit hp100_eisa_remove (struct device *gendev)
 {
-	struct net_device *dev = gendev->driver_data;
+	struct net_device *dev = dev_get_drvdata(gendev);
 	cleanup_dev(dev);
 	return 0;
 }
drivers/net/ne3210.c +2 -2
diff -Narup a/drivers/net/ne3210.c b/drivers/net/ne3210.c
@@ -107,7 +107,7 @@ static int __init ne3210_eisa_probe (str
 
 	SET_MODULE_OWNER(dev);
 	SET_NETDEV_DEV(dev, device);
-	device->driver_data = dev;
+	dev_set_drvdata(device, dev);
 	ioaddr = edev->base_addr;
 
 	if (!request_region(ioaddr, NE3210_IO_EXTENT, DRV_NAME)) {
@@ -232,7 +232,7 @@ static int __init ne3210_eisa_probe (str
 
 static int __devexit ne3210_eisa_remove (struct device *device)
 {
-	struct net_device  *dev    = device->driver_data;
+	struct net_device  *dev    = dev_get_drvdata(device);
 	unsigned long       ioaddr = to_eisa_device (device)->base_addr;
 
 	unregister_netdev (dev);
drivers/net/smc-mca.c +2 -2
diff -Narup a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
@@ -353,7 +353,7 @@ static int __init ultramca_probe(struct 
 
 	outb(reg4, ioaddr + 4);
 
-	gen_dev->driver_data = dev;
+	dev_set_drvdata(gen_dev, dev);
 
 	/* The 8390 isn't at the base address, so fake the offset
 	 */
@@ -519,7 +519,7 @@ static int ultramca_close_card(struct ne
 static int ultramca_remove(struct device *gen_dev)
 {
 	struct mca_device *mca_dev = to_mca_device(gen_dev);
-	struct net_device *dev = (struct net_device *)gen_dev->driver_data;
+	struct net_device *dev = dev_get_drvdata(gen_dev);
 
 	if (dev) {
 		/* NB: ultra_close_card() does free_irq */
drivers/net/tulip/de4x5.c +3 -3
diff -Narup a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
@@ -1081,7 +1081,7 @@ static int (*dc_infoblock[])(struct net_
     mdelay(2);                           /* Wait for 2ms */\
 }
 
-
+
 static int __devinit 
 de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
 {
@@ -1090,7 +1090,7 @@ de4x5_hw_init(struct net_device *dev, u_
     struct pci_dev *pdev = NULL;
     int i, status=0;
 
-    gendev->driver_data = dev;
+    dev_set_drvdata(gendev, dev);
 
     /* Ensure we're not sleeping */
     if (lp->bus == EISA) {
@@ -2100,7 +2100,7 @@ static int __devexit de4x5_eisa_remove (
 	struct net_device *dev;
 	u_long iobase;
 
-	dev = device->driver_data;
+	dev = dev_get_drvdata(device);
 	iobase = dev->base_addr;
 	
 	unregister_netdev (dev);
drivers/net/wireless/ipw2100.c +4 -4
diff -Narup a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
@@ -3362,7 +3362,7 @@ static DEVICE_ATTR(pci, S_IRUGO, show_pc
 static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
 			char *buf)
 {
-	struct ipw2100_priv *p = d->driver_data;
+	struct ipw2100_priv *p = dev_get_drvdata(d);
 	return sprintf(buf, "0x%08x\n", (int)p->config);
 }
 
@@ -3371,7 +3371,7 @@ static DEVICE_ATTR(cfg, S_IRUGO, show_cf
 static ssize_t show_status(struct device *d, struct device_attribute *attr,
 			   char *buf)
 {
-	struct ipw2100_priv *p = d->driver_data;
+	struct ipw2100_priv *p = dev_get_drvdata(d);
 	return sprintf(buf, "0x%08x\n", (int)p->status);
 }
 
@@ -3380,7 +3380,7 @@ static DEVICE_ATTR(status, S_IRUGO, show
 static ssize_t show_capability(struct device *d, struct device_attribute *attr,
 			       char *buf)
 {
-	struct ipw2100_priv *p = d->driver_data;
+	struct ipw2100_priv *p = dev_get_drvdata(d);
 	return sprintf(buf, "0x%08x\n", (int)p->capability);
 }
 
@@ -4102,7 +4102,7 @@ static ssize_t show_rf_kill(struct devic
 	   1 - SW based RF kill active (sysfs)
 	   2 - HW based RF kill active
 	   3 - Both HW and SW baed RF kill active */
-	struct ipw2100_priv *priv = (struct ipw2100_priv *)d->driver_data;
+	struct ipw2100_priv *priv = dev_get_drvdata(d);
 	int val = ((priv->status & STATUS_RF_KILL_SW) ? 0x1 : 0x0) |
 	    (rf_kill_active(priv) ? 0x2 : 0x0);
 	return sprintf(buf, "%i\n", val);
drivers/net/wireless/ipw2200.c +23 -23

184 lines not on this page · raw message

#2 lore raw

PATCH 2/3 s390: Replace driver_data with dev_[gs]et_drvdata

In reply to Richard Knutsson

From: Richard Knutsson <[email protected]>

Replace (found) dev->driver_data with dev_[gs]et_drvdata().

---

 block/dasd_devmap.c |    2
 char/raw3270.c      |    6 +-
 char/tape_core.c    |   10 ++--
 char/vmlogrdr.c     |   14 ++---
 cio/device.c        |   14 ++---
 net/claw.c          |   20 ++++----
 net/ctcmain.c       |   12 ++--
 net/lcs.c           |    8 +--
 net/netiucv.c       |   46 +++++++++---------
 net/qeth_main.c     |    2
 net/qeth_proc.c     |    6 +-
 net/qeth_sys.c      |  130 ++++++++++++++++++++++++++--------------------------
 12 files changed, 135 insertions(+), 135 deletions(-)
drivers/s390/block/dasd_devmap.c +1 -1
diff -Narup a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
@@ -707,7 +707,7 @@ dasd_discipline_show(struct device *dev,
 
 	spin_lock(&dasd_devmap_lock);
 	dname = "none";
-	devmap = dev->driver_data;
+	devmap = dev_get_drvdata(dev);
 	if (devmap && devmap->device && devmap->device->discipline)
 		dname = devmap->device->discipline->name;
 	spin_unlock(&dasd_devmap_lock);
drivers/s390/char/tape_core.c +5 -5
diff -Narup a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
@@ -112,7 +112,7 @@ tape_medium_state_show(struct device *de
 {
 	struct tape_device *tdev;
 
-	tdev = (struct tape_device *) dev->driver_data;
+	tdev = dev_get_drvdata(dev);
 	return scnprintf(buf, PAGE_SIZE, "%i\n", tdev->medium_state);
 }
 
@@ -124,7 +124,7 @@ tape_first_minor_show(struct device *dev
 {
 	struct tape_device *tdev;
 
-	tdev = (struct tape_device *) dev->driver_data;
+	tdev = dev_get_drvdata(dev);
 	return scnprintf(buf, PAGE_SIZE, "%i\n", tdev->first_minor);
 }
 
@@ -136,7 +136,7 @@ tape_state_show(struct device *dev, stru
 {
 	struct tape_device *tdev;
 
-	tdev = (struct tape_device *) dev->driver_data;
+	tdev = dev_get_drvdata(dev);
 	return scnprintf(buf, PAGE_SIZE, "%s\n", (tdev->first_minor < 0) ?
 		"OFFLINE" : tape_state_verbose[tdev->tape_state]);
 }
@@ -150,7 +150,7 @@ tape_operation_show(struct device *dev, 
 	struct tape_device *tdev;
 	ssize_t rc;
 
-	tdev = (struct tape_device *) dev->driver_data;
+	tdev = dev_get_drvdata(dev);
 	if (tdev->first_minor < 0)
 		return scnprintf(buf, PAGE_SIZE, "N/A\n");
 
@@ -176,7 +176,7 @@ tape_blocksize_show(struct device *dev, 
 {
 	struct tape_device *tdev;
 
-	tdev = (struct tape_device *) dev->driver_data;
+	tdev = dev_get_drvdata(dev);
 
 	return scnprintf(buf, PAGE_SIZE, "%i\n", tdev->char_data.block_size);
 }
drivers/s390/char/raw3270.c +3 -3
diff -Narup a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
@@ -1142,7 +1142,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->driver_data)->model);
+			((struct raw3270 *) dev_get_drvdata(dev))->model);
 }
 static DEVICE_ATTR(model, 0444, raw3270_model_show, 0);
 
@@ -1150,7 +1150,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->driver_data)->rows);
+			((struct raw3270 *) dev_get_drvdata(dev))->rows);
 }
 static DEVICE_ATTR(rows, 0444, raw3270_rows_show, 0);
 
@@ -1158,7 +1158,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->driver_data)->cols);
+			((struct raw3270 *) dev_get_drvdata(dev))->cols);
 }
 static DEVICE_ATTR(columns, 0444, raw3270_columns_show, 0);
 
drivers/s390/char/vmlogrdr.c +7 -7
diff -Narup a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
@@ -549,7 +549,7 @@ vmlogrdr_read (struct file *filp, char *
 
 static ssize_t
 vmlogrdr_autopurge_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {
-	struct vmlogrdr_priv_t *priv = dev->driver_data;
+	struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);
 	ssize_t ret = count;
 
 	switch (buf[0]) {
@@ -568,7 +568,7 @@ vmlogrdr_autopurge_store(struct device *
 
 static ssize_t
 vmlogrdr_autopurge_show(struct device *dev, struct device_attribute *attr, char *buf) {
-	struct vmlogrdr_priv_t *priv = dev->driver_data;
+	struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);
 	return sprintf(buf, "%u\n", priv->autopurge);
 }
 
@@ -582,7 +582,7 @@ vmlogrdr_purge_store(struct device * dev
 
 	char cp_command[80];
 	char cp_response[80];
-	struct vmlogrdr_priv_t *priv = dev->driver_data;
+	struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);
 
 	if (buf[0] != '1')
 		return -EINVAL;
@@ -621,7 +621,7 @@ static DEVICE_ATTR(purge, 0200, NULL, vm
 static ssize_t
 vmlogrdr_autorecording_store(struct device *dev, struct device_attribute *attr, const char *buf,
 			     size_t count) {
-	struct vmlogrdr_priv_t *priv = dev->driver_data;
+	struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);
 	ssize_t ret = count;
 
 	switch (buf[0]) {
@@ -640,7 +640,7 @@ vmlogrdr_autorecording_store(struct devi
 
 static ssize_t
 vmlogrdr_autorecording_show(struct device *dev, struct device_attribute *attr, char *buf) {
-	struct vmlogrdr_priv_t *priv = dev->driver_data;
+	struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);
 	return sprintf(buf, "%u\n", priv->autorecording);
 }
 
@@ -652,7 +652,7 @@ static DEVICE_ATTR(autorecording, 0644, 
 static ssize_t
 vmlogrdr_recording_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {
 
-	struct vmlogrdr_priv_t *priv = dev->driver_data;
+	struct vmlogrdr_priv_t *priv = dev_get_drvdata(dev);
 	ssize_t ret;
 
 	switch (buf[0]) {
@@ -799,7 +799,7 @@ vmlogrdr_register_device(struct vmlogrdr
 		device_unregister(dev);
 		return ret;
 	}
-	dev->driver_data = priv;
+	dev_set_drvdata(dev, priv);
 	priv->device = dev;
 	return 0;
 }
drivers/s390/cio/device.c +7 -7
diff -Narup a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
@@ -882,12 +882,12 @@ io_subchannel_remove (struct device *dev
 	struct ccw_device *cdev;
 	unsigned long flags;
 
-	if (!dev->driver_data)
+	if (!dev_get_drvdata(dev))
 		return 0;
-	cdev = dev->driver_data;
+	cdev = dev_get_drvdata(dev);
 	/* Set ccw device to not operational and drop reference. */
 	spin_lock_irqsave(cdev->ccwlock, flags);
-	dev->driver_data = NULL;
+	dev_set_drvdata(dev, NULL);
 	cdev->private->state = DEV_STATE_NOT_OPER;
 	spin_unlock_irqrestore(cdev->ccwlock, flags);
 	/*
@@ -907,7 +907,7 @@ io_subchannel_notify(struct device *dev,
 {
 	struct ccw_device *cdev;
 
-	cdev = dev->driver_data;
+	cdev = dev_get_drvdata(dev);
 	if (!cdev)
 		return 0;
 	if (!cdev->drv)
@@ -922,7 +922,7 @@ io_subchannel_verify(struct device *dev)
 {
 	struct ccw_device *cdev;
 
-	cdev = dev->driver_data;
+	cdev = dev_get_drvdata(dev);
 	if (cdev)
 		dev_fsm_event(cdev, DEV_EVENT_VERIFY);
 }
@@ -932,7 +932,7 @@ io_subchannel_ioterm(struct device *dev)
 {
 	struct ccw_device *cdev;
 
-	cdev = dev->driver_data;
+	cdev = dev_get_drvdata(dev);
 	if (!cdev)
 		return;
 	cdev->private->state = DEV_STATE_CLEAR_VERIFY;
@@ -949,7 +949,7 @@ io_subchannel_shutdown(struct device *de
 	int ret;
 
 	sch = to_subchannel(dev);
-	cdev = dev->driver_data;
+	cdev = dev_get_drvdata(dev);
 
 	if (cio_is_console(sch->irq))
 		return;
drivers/s390/net/netiucv.c +23 -23

184 lines not on this page · raw message

drivers/s390/net/claw.c +10 -10
diff -Narup a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
@@ -4141,7 +4141,7 @@ claw_hname_show(struct device *dev, stru
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4154,7 +4154,7 @@ claw_hname_write(struct device *dev, str
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4178,7 +4178,7 @@ claw_adname_show(struct device *dev, str
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4191,7 +4191,7 @@ claw_adname_write(struct device *dev, st
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4215,7 +4215,7 @@ claw_apname_show(struct device *dev, str
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4229,7 +4229,7 @@ claw_apname_write(struct device *dev, st
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4263,7 +4263,7 @@ claw_wbuff_show(struct device *dev, stru
 	struct claw_privbk *priv;
 	struct claw_env * p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4277,7 +4277,7 @@ claw_wbuff_write(struct device *dev, str
 	struct claw_env *  p_env;
 	int nnn,max;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4304,7 +4304,7 @@ claw_rbuff_show(struct device *dev, stru
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
@@ -4318,7 +4318,7 @@ claw_rbuff_write(struct device *dev, str
 	struct claw_env *p_env;
 	int nnn,max;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev)
 	if (!priv)
 		return -ENODEV;
 	p_env = priv->p_env;
drivers/s390/net/qeth_sys.c +65 -65

520 lines not on this page · raw message

drivers/s390/net/qeth_proc.c +3 -3
diff -Narup a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c
@@ -135,7 +135,7 @@ qeth_procfile_seq_show(struct seq_file *
 			      "---- ----- -----\n");
 	} else {
 		device = (struct device *) it;
-		card = device->driver_data;
+		card = dev_get_drvdata(device);
 		seq_printf(s, "%s/%s/%s x%02X   %-10s %-14s %-4i ",
 				CARD_RDEV_ID(card),
 				CARD_WDEV_ID(card),
@@ -230,7 +230,7 @@ qeth_perf_procfile_seq_show(struct seq_f
 	struct qeth_card *card;
 
 	device = (struct device *) it;
-	card = device->driver_data;
+	card = dev_get_drvdata(device);
 	seq_printf(s, "For card with devnos %s/%s/%s (%s):\n",
 			CARD_RDEV_ID(card),
 			CARD_WDEV_ID(card),
@@ -385,7 +385,7 @@ qeth_ipato_procfile_seq_show(struct seq_
 	 * else output setting for respective card
 	 */
 	device = (struct device *) it;
-	card = device->driver_data;
+	card = dev_get_drvdata(device);
 
 	return 0;
 }
drivers/s390/net/lcs.c +4 -4
diff -Narup a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
@@ -1987,7 +1987,7 @@ lcs_portno_show (struct device *dev, str
 {
         struct lcs_card *card;
 
-	card = (struct lcs_card *)dev->driver_data;
+	card = dev_get_drvdata(dev);
 
         if (!card)
                 return 0;
@@ -2004,7 +2004,7 @@ lcs_portno_store (struct device *dev, st
         struct lcs_card *card;
         int value;
 
-	card = (struct lcs_card *)dev->driver_data;
+	card = dev_get_drvdata(dev);
 
         if (!card)
                 return 0;
@@ -2038,7 +2038,7 @@ lcs_timeout_show(struct device *dev, str
 {
 	struct lcs_card *card;
 
-	card = (struct lcs_card *)dev->driver_data;
+	card = dev_get_drvdata(dev);
 
 	return card ? sprintf(buf, "%u\n", card->lancmd_timeout) : 0;
 }
@@ -2049,7 +2049,7 @@ lcs_timeout_store (struct device *dev, s
         struct lcs_card *card;
         int value;
 
-	card = (struct lcs_card *)dev->driver_data;
+	card = dev_get_drvdata(dev);
 
         if (!card)
                 return 0;
drivers/s390/net/qeth_main.c +1 -1
diff -Narup a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
@@ -8497,7 +8497,7 @@ __qeth_reboot_event_card(struct device *
 {
 	struct qeth_card *card;
 
-	card = (struct qeth_card *) dev->driver_data;
+	card = dev_get_drvdata(dev);
 	qeth_clear_ip_list(card, 0, 0);
 	qeth_qdio_clear_card(card, 0);
 	return 0;
drivers/s390/net/ctcmain.c +6 -6
diff -Narup a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
@@ -2478,7 +2478,7 @@ buffer_show(struct device *dev, struct d
 {
 	struct ctc_priv *priv;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev);
 	if (!priv)
 		return -ENODEV;
 	return sprintf(buf, "%d\n",
@@ -2495,7 +2495,7 @@ buffer_write(struct device *dev, struct 
 
 	DBF_TEXT(trace, 3, __FUNCTION__);
 	DBF_TEXT(trace, 3, buf);
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev);
 	if (!priv) {
 		DBF_TEXT(trace, 3, "bfnopriv");
 		return -ENODEV;
@@ -2596,7 +2596,7 @@ ctc_print_statistics(struct ctc_priv *pr
 static ssize_t
 stats_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-	struct ctc_priv *priv = dev->driver_data;
+	struct ctc_priv *priv = dev_get_drvdata(dev);
 	if (!priv)
 		return -ENODEV;
 	ctc_print_statistics(priv);
@@ -2606,7 +2606,7 @@ stats_show(struct device *dev, struct de
 static ssize_t
 stats_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-	struct ctc_priv *priv = dev->driver_data;
+	struct ctc_priv *priv = dev_get_drvdata(dev);
 	if (!priv)
 		return -ENODEV;
 	/* Reset statistics */
@@ -2662,7 +2662,7 @@ ctc_proto_show(struct device *dev, struc
 {
 	struct ctc_priv *priv;
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev);
 	if (!priv)
 		return -ENODEV;
 
@@ -2678,7 +2678,7 @@ ctc_proto_store(struct device *dev, stru
 	DBF_TEXT(trace, 3, __FUNCTION__);
 	pr_debug("%s() called\n", __FUNCTION__);
 
-	priv = dev->driver_data;
+	priv = dev_get_drvdata(dev);
 	if (!priv)
 		return -ENODEV;
 	sscanf(buf, "%u", &value);
#3 lore raw

PATCH 3/3 *rest*: Replace driver_data with dev_[gs]et_drvdata

In reply to Richard Knutsson

From: Richard Knutsson <[email protected]>

Replace (found) dev->driver_data with dev_[gs]et_drvdata().

---

ide/ide.c      |    4 ++--
scsi/aha1740.c |    2 +-
usb/core/usb.c |    6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
drivers/ide/ide.c +0 -0
diff -Narup a/drivers/ide/ide.c b/drivers/ide/ide.c
@@ -1216,7 +1216,7 @@ EXPORT_SYMBOL(system_bus_clock);
 

static int generic_ide_suspend(struct device *dev, pm_message_t state) {
- ide_drive_t *drive = dev->driver_data;

+	ide_drive_t *drive = dev_get_drvdata(dev);
	struct request rq;
	struct request_pm_state rqpm;
	ide_task_t args;

@@ -1235,7 +1235,7 @@ static int generic_ide_suspend(struct de

static int generic_ide_resume(struct device *dev)
{
- ide_drive_t *drive = dev->driver_data;

+	ide_drive_t *drive = dev_get_drvdata(dev);
	struct request rq;
	struct request_pm_state rqpm;
	ide_task_t args;
drivers/scsi/aha1740.c +0 -0
diff -Narup a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
@@ -659,7 +659,7 @@ static int aha1740_probe (struct device 
 

static __devexit int aha1740_remove (struct device *dev) {
- struct Scsi_Host *shpnt = dev->driver_data;

+	struct Scsi_Host *shpnt = dev_get_drvdata(dev);
	struct aha1740_hostdata *host = HOSTDATA (shpnt);

	scsi_remove_host(shpnt);
drivers/usb/core/usb.c +0 -0
diff -Narup a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
@@ -574,7 +574,7 @@ static int usb_hotplug (struct device *d
 
	/* Must check driver_data here, as on remove driver is always NULL */
	if ((dev->driver == &usb_generic_driver) || 
-	    (dev->driver_data == &usb_generic_driver_data))
+	    (dev_get_drvdata(dev) == &usb_generic_driver_data))
		return 0;

	intf = to_usb_interface(dev);
@@ -1414,7 +1414,7 @@ static int usb_generic_suspend(struct de
	}

	if ((dev->driver == NULL) ||
-	    (dev->driver_data == &usb_generic_driver_data))
+	    (dev_get_drvdata(dev) == &usb_generic_driver_data))
		return 0;

	intf = to_usb_interface(dev);
@@ -1460,7 +1460,7 @@ static int usb_generic_resume(struct dev
	}

	if ((dev->driver == NULL) ||
-	    (dev->driver_data == &usb_generic_driver_data))
+	    (dev_get_drvdata(dev) == &usb_generic_driver_data))
		return 0;

	intf = to_usb_interface(dev);