diff options
| author | Cornelia Huck <cohuck@de.ibm.com> | 2006-01-06 00:19:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 08:33:51 -0800 |
| commit | a8237fc4108060402d904bea5e1062e22e731969 (patch) | |
| tree | fc19e33ea8bbe664c33fba6c78b34e497f2cc478 /drivers/s390/cio/device_ops.c | |
| parent | 8129ee164267dc030b8e1d541ee3643c0b9f2fa1 (diff) | |
| download | kernel_samsung_smdk4412-a8237fc4108060402d904bea5e1062e22e731969.zip kernel_samsung_smdk4412-a8237fc4108060402d904bea5e1062e22e731969.tar.gz kernel_samsung_smdk4412-a8237fc4108060402d904bea5e1062e22e731969.tar.bz2 | |
[PATCH] s390: introduce struct subchannel_id
This patch introduces a struct subchannel_id containing the subchannel number
(formerly referred to as "irq") and switches code formerly relying on the
subchannel number over to it.
While we're touching inline assemblies anyway, make sure they have correct
memory constraints.
Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390/cio/device_ops.c')
| -rw-r--r-- | drivers/s390/cio/device_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c index 85a3026..143b6c2 100644 --- a/drivers/s390/cio/device_ops.c +++ b/drivers/s390/cio/device_ops.c @@ -1,7 +1,7 @@ /* * drivers/s390/cio/device_ops.c * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation @@ -570,7 +570,7 @@ ccw_device_get_chp_desc(struct ccw_device *cdev, int chp_no) int _ccw_device_get_subchannel_number(struct ccw_device *cdev) { - return cdev->private->irq; + return cdev->private->sch_no; } int |