Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756896AbYK0Kx3 (ORCPT ); Thu, 27 Nov 2008 05:53:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753143AbYK0Kd5 (ORCPT ); Thu, 27 Nov 2008 05:33:57 -0500 Received: from mtagate7.de.ibm.com ([195.212.29.156]:62891 "EHLO mtagate7.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752983AbYK0KcZ (ORCPT ); Thu, 27 Nov 2008 05:32:25 -0500 Message-Id: <20081127103136.171738662@de.ibm.com> References: <20081127103020.528516828@de.ibm.com> User-Agent: quilt/0.46-1 Date: Thu, 27 Nov 2008 11:30:50 +0100 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens , Cornelia Huck , Martin Schwidefsky Subject: [patch 30/60] dasd: Use accessors instead of using driver_data directly. Content-Disposition: inline; filename=129-dasd-accessors.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1717 Lines: 52 From: Cornelia Huck Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky --- drivers/s390/block/dasd_devmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: quilt-2.6/drivers/s390/block/dasd_devmap.c =================================================================== --- quilt-2.6.orig/drivers/s390/block/dasd_devmap.c +++ quilt-2.6/drivers/s390/block/dasd_devmap.c @@ -562,7 +562,7 @@ dasd_create_device(struct ccw_device *cd } spin_lock_irqsave(get_ccwdev_lock(cdev), flags); - cdev->dev.driver_data = device; + dev_set_drvdata(&cdev->dev, device); spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags); return device; @@ -598,7 +598,7 @@ dasd_delete_device(struct dasd_device *d /* Disconnect dasd_device structure from ccw_device structure. */ spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags); - device->cdev->dev.driver_data = NULL; + dev_set_drvdata(&device->cdev->dev, NULL); spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags); /* @@ -639,7 +639,7 @@ dasd_put_device_wake(struct dasd_device struct dasd_device * dasd_device_from_cdev_locked(struct ccw_device *cdev) { - struct dasd_device *device = cdev->dev.driver_data; + struct dasd_device *device = dev_get_drvdata(&cdev->dev); if (!device) return ERR_PTR(-ENODEV); -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- 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/