From ee89360c77b13a3e82ac40a8e28b2f6b4a071763 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 30 Apr 2009 14:43:31 -0700 Subject: [PATCH] --- yaml --- r: 151277 b: refs/heads/master c: 78c55d76b84628862079351f77aa0f4aa3b65f58 h: refs/heads/master i: 151275: 70711cd5d8bf16cdb2e49a56392b796c58b0b067 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aha1740.c | 2 +- trunk/drivers/scsi/libsrp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aeca03ca334e..2783b5b83ba1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3e7a7b64a79a3d82835ce83fb32616df762d456 +refs/heads/master: 78c55d76b84628862079351f77aa0f4aa3b65f58 diff --git a/trunk/drivers/scsi/aha1740.c b/trunk/drivers/scsi/aha1740.c index ed0e3e55652a..538135783aab 100644 --- a/trunk/drivers/scsi/aha1740.c +++ b/trunk/drivers/scsi/aha1740.c @@ -646,7 +646,7 @@ static int aha1740_probe (struct device *dev) 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); diff --git a/trunk/drivers/scsi/libsrp.c b/trunk/drivers/scsi/libsrp.c index 15e2d132e8b9..2742ae8a3d09 100644 --- a/trunk/drivers/scsi/libsrp.c +++ b/trunk/drivers/scsi/libsrp.c @@ -135,7 +135,7 @@ int srp_target_alloc(struct srp_target *target, struct device *dev, INIT_LIST_HEAD(&target->cmd_queue); target->dev = dev; - target->dev->driver_data = target; + dev_set_drvdata(target->dev, target); target->srp_iu_size = iu_size; target->rx_ring_size = nr;