Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5ba6c86 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[S390] cio: Clean up online_store. 



Detangle the online_store code and make it more readable.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c9182e0f

drivers/s390/cio/device.c

+62 −47
Original line number Diff line number Diff line
@@ -413,28 +413,18 @@ ccw_device_set_online(struct ccw_device *cdev) 
	return (ret == 0) ? -ENODEV : ret;

}



static ssize_t

online_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

static void online_store_handle_offline(struct ccw_device *cdev)

{

	struct ccw_device *cdev = to_ccwdev(dev);

	int i, force, ret;

	char *tmp;

	if (cdev->private->state == DEV_STATE_DISCONNECTED)

		ccw_device_remove_disconnected(cdev);

	else if (cdev->drv && cdev->drv->set_offline)

		ccw_device_set_offline(cdev);

}



	if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)

		return -EAGAIN;

static int online_store_recog_and_online(struct ccw_device *cdev)

{

	int ret;



	if (cdev->drv && !try_module_get(cdev->drv->owner)) {

		atomic_set(&cdev->private->onoff, 0);

		return -EINVAL;

	}

	if (!strncmp(buf, "force\n", count)) {

		force = 1;

		i = 1;

	} else {

		force = 0;

		i = simple_strtoul(buf, &tmp, 16);

	}

	if (i == 1) {

	/* Do device recognition, if needed. */

	if (cdev->id.cu_type == 0) {

		ret = ccw_device_recognition(cdev);
@@ -442,43 +432,68 @@ online_store (struct device *dev, struct device_attribute *attr, const char *buf 
			printk(KERN_WARNING"Couldn't start recognition "

			       "for device %s (ret=%d)\n",

			       cdev->dev.bus_id, ret);

				goto out;

			return ret;

		}

		wait_event(cdev->private->wait_q,

			   cdev->private->flags.recog_done);

	}

	if (cdev->drv && cdev->drv->set_online)

		ccw_device_set_online(cdev);

	} else if (i == 0) {

		if (cdev->private->state == DEV_STATE_DISCONNECTED)

			ccw_device_remove_disconnected(cdev);

		else if (cdev->drv && cdev->drv->set_offline)

			ccw_device_set_offline(cdev);

	return 0;

}

static void online_store_handle_online(struct ccw_device *cdev, int force)

{

	int ret;



	ret = online_store_recog_and_online(cdev);

	if (ret)

		return;

	if (force && cdev->private->state == DEV_STATE_BOXED) {

		ret = ccw_device_stlck(cdev);

		if (ret) {

			printk(KERN_WARNING"ccw_device_stlck for device %s "

			       "returned %d!\n", cdev->dev.bus_id, ret);

			goto out;

			return;

		}

		/* Do device recognition, if needed. */

		if (cdev->id.cu_type == 0) {

		if (cdev->id.cu_type == 0)

			cdev->private->state = DEV_STATE_NOT_OPER;

			ret = ccw_device_recognition(cdev);

			if (ret) {

				printk(KERN_WARNING"Couldn't start recognition "

				       "for device %s (ret=%d)\n",

				       cdev->dev.bus_id, ret);

				goto out;

		online_store_recog_and_online(cdev);

	}

			wait_event(cdev->private->wait_q,

				   cdev->private->flags.recog_done);



}

		if (cdev->drv && cdev->drv->set_online)

			ccw_device_set_online(cdev);



static ssize_t online_store (struct device *dev, struct device_attribute *attr,

			     const char *buf, size_t count)

{

	struct ccw_device *cdev = to_ccwdev(dev);

	int i, force;

	char *tmp;



	if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)

		return -EAGAIN;



	if (cdev->drv && !try_module_get(cdev->drv->owner)) {

		atomic_set(&cdev->private->onoff, 0);

		return -EINVAL;

	}

	if (!strncmp(buf, "force\n", count)) {

		force = 1;

		i = 1;

	} else {

		force = 0;

		i = simple_strtoul(buf, &tmp, 16);

	}



	switch (i) {

	case 0:

		online_store_handle_offline(cdev);

		break;

	case 1:

		online_store_handle_online(cdev, force);

		break;

	default:

		count = -EINVAL;

	}

	out:

	if (cdev->drv)

		module_put(cdev->drv->owner);

	atomic_set(&cdev->private->onoff, 0);