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

Commit 0506d5ba authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/lcs: don't use intparm for channel IO 



lcs passes an intparm when calling ccw_device_*(), even though lcs_irq()
later makes no use of this.

To reduce the confusion, consistently pass 0 as intparm instead.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarSebastian Ott <sebott@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f6e01f3

drivers/s390/net/lcs.c

+3 −3
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ lcs_clear_channel(struct lcs_channel *channel) 
	LCS_DBF_TEXT(4,trace,"clearch");

	LCS_DBF_TEXT_(4, trace, "%s", dev_name(&channel->ccwdev->dev));

	spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);

	rc = ccw_device_clear(channel->ccwdev, (addr_t) channel);

	rc = ccw_device_clear(channel->ccwdev, 0);

	spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);

	if (rc) {

		LCS_DBF_TEXT_(4, trace, "ecsc%s",
@@ -532,7 +532,7 @@ lcs_stop_channel(struct lcs_channel *channel) 
	LCS_DBF_TEXT_(4, trace, "%s", dev_name(&channel->ccwdev->dev));

	channel->state = LCS_CH_STATE_INIT;

	spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);

	rc = ccw_device_halt(channel->ccwdev, (addr_t) channel);

	rc = ccw_device_halt(channel->ccwdev, 0);

	spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);

	if (rc) {

		LCS_DBF_TEXT_(4, trace, "ehsc%s",
@@ -1427,7 +1427,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) 
		channel->state = LCS_CH_STATE_SUSPENDED;

	if (irb->scsw.cmd.fctl & SCSW_FCTL_HALT_FUNC) {

		if (irb->scsw.cmd.cc != 0) {

			ccw_device_halt(channel->ccwdev, (addr_t) channel);

			ccw_device_halt(channel->ccwdev, 0);

			return;

		}

		/* The channel has been stopped by halt_IO. */