Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936734AbZFPGBu (ORCPT ); Tue, 16 Jun 2009 02:01:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935891AbZFPFvh (ORCPT ); Tue, 16 Jun 2009 01:51:37 -0400 Received: from kroah.org ([198.145.64.141]:48435 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935899AbZFPFvd (ORCPT ); Tue, 16 Jun 2009 01:51:33 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , linux-scsi@vger.kernel.org, James Bottomley Subject: [PATCH 47/64] scsi: remove driver_data direct access of struct device Date: Mon, 15 Jun 2009 22:46:36 -0700 Message-Id: <1245131213-24168-47-git-send-email-gregkh@suse.de> X-Mailer: git-send-email 1.6.3.1 In-Reply-To: <20090616051351.GA23627@kroah.com> References: <20090616051351.GA23627@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1726 Lines: 48 In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions. Cc: linux-scsi@vger.kernel.org Cc: James Bottomley Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/aha1740.c | 2 +- drivers/scsi/libsrp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c index ed0e3e5..5381357 100644 --- a/drivers/scsi/aha1740.c +++ b/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/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c index 15e2d13..2742ae8 100644 --- a/drivers/scsi/libsrp.c +++ b/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; -- 1.6.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/