From 7f5ad3193a012da75eb44e9c6ccd3e71d7f1ce48 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Mon, 7 Dec 2009 12:51:33 +0100 Subject: [PATCH] --- yaml --- r: 173244 b: refs/heads/master c: 7d253b9a1aaf5192808e641659f4feb122faa536 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/device.c | 11 +++-------- trunk/drivers/s390/cio/io_sch.h | 1 - 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 64ae0eba4018..001a6c77518a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7d12ef2befac4fed0dccaddff11338b654804df +refs/heads/master: 7d253b9a1aaf5192808e641659f4feb122faa536 diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c index e24b9b1d1022..f4401ede768a 100644 --- a/trunk/drivers/s390/cio/device.c +++ b/trunk/drivers/s390/cio/device.c @@ -303,7 +303,7 @@ int ccw_device_is_orphan(struct ccw_device *cdev) static void ccw_device_unregister(struct ccw_device *cdev) { - if (test_and_clear_bit(1, &cdev->private->registered)) { + if (device_is_registered(&cdev->dev)) { device_del(&cdev->dev); /* Release reference from device_initialize(). */ put_device(&cdev->dev); @@ -640,12 +640,7 @@ static int ccw_device_register(struct ccw_device *cdev) cdev->private->dev_id.devno); if (ret) return ret; - ret = device_add(dev); - if (ret) - return ret; - - set_bit(1, &cdev->private->registered); - return ret; + return device_add(dev); } static int match_dev_id(struct device *dev, void *data) @@ -669,7 +664,7 @@ static void ccw_device_do_unbind_bind(struct ccw_device *cdev) { int ret; - if (test_bit(1, &cdev->private->registered)) { + if (device_is_registered(&cdev->dev)) { device_release_driver(&cdev->dev); ret = device_attach(&cdev->dev); WARN_ON(ret == -ENODEV); diff --git a/trunk/drivers/s390/cio/io_sch.h b/trunk/drivers/s390/cio/io_sch.h index 0559479073cc..ca1063d6b505 100644 --- a/trunk/drivers/s390/cio/io_sch.h +++ b/trunk/drivers/s390/cio/io_sch.h @@ -145,7 +145,6 @@ struct ccw_device_private { struct subchannel *sch; int state; /* device state */ atomic_t onoff; - unsigned long registered; struct ccw_dev_id dev_id; /* device id */ struct subchannel_id schid; /* subchannel number */ struct ccw_request req; /* internal I/O request */