Commit 420105f4 authored by Sven Schnelle's avatar Sven Schnelle Committed by Heiko Carstens
Browse files

s390/raw3270: split up raw3270_activate_view() 



move the core processing to __raw3270_activate_view() to
reduce the required if/else blocks and indentiion levels.

Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 7aeeeb92

drivers/s390/char/raw3270.c

+46 −28
Original line number Diff line number Diff line
@@ -886,47 +886,65 @@ int raw3270_view_lock_unavailable(struct raw3270_view *view) 
	return 0;

}



/*

 * Activate a view.

 */

int raw3270_activate_view(struct raw3270_view *view)

static int raw3270_assign_activate_view(struct raw3270 *rp, struct raw3270_view *view)

{

	struct raw3270 *rp;

	struct raw3270_view *oldview, *nv;

	unsigned long flags;

	rp->view = view;

	return view->fn->activate(view);

}



static int __raw3270_activate_view(struct raw3270 *rp, struct raw3270_view *view)

{

	struct raw3270_view *oldview = NULL, *nv;

	int rc;



	rp = view->dev;

	if (!rp)

		return -ENODEV;

	spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);

	if (rp->view == view) {

		rc = 0;

	} else if (!raw3270_state_ready(rp)) {

		rc = -EBUSY;

	} else {

		oldview = NULL;

	if (rp->view == view)

		return 0;



	if (!raw3270_state_ready(rp))

		return -EBUSY;



	if (rp->view && rp->view->fn->deactivate) {

		oldview = rp->view;

		oldview->fn->deactivate(oldview);

	}

		rp->view = view;

		rc = view->fn->activate(view);

		if (rc) {



	rc = raw3270_assign_activate_view(rp, view);

	if (!rc)

		return 0;



	/* Didn't work. Try to reactivate the old view. */

			rp->view = oldview;

			if (!oldview || oldview->fn->activate(oldview) != 0) {

	if (oldview) {

		rc = raw3270_assign_activate_view(rp, oldview);

		if (!rc)

			return 0;

	}



	/* Didn't work as well. Try any other view. */

				list_for_each_entry(nv, &rp->view_list, list)

					if (nv != view && nv != oldview) {

						rp->view = nv;

						if (nv->fn->activate(nv) == 0)

	list_for_each_entry(nv, &rp->view_list, list) {

		if (nv == view || nv == oldview)

			continue;

		rc = raw3270_assign_activate_view(rp, nv);

		if (!rc)

			break;

		rp->view = NULL;

	}

	return rc;

}

		}

	}



/*

 * Activate a view.

 */

int raw3270_activate_view(struct raw3270_view *view)

{

	struct raw3270 *rp;

	unsigned long flags;

	int rc;



	rp = view->dev;

	if (!rp)

		return -ENODEV;

	spin_lock_irqsave(get_ccwdev_lock(rp->cdev), flags);

	rc = __raw3270_activate_view(rp, view);

	spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);

	return rc;

}