aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/chsc.h
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2014-05-07 13:27:21 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-20 08:58:53 +0200
commit2bf29df7460f4038f84ac5dea3cbe582d6d4af82 (patch)
treef3c8fc9a1199da5a2d0426cc509d145097c22894 /drivers/s390/cio/chsc.h
parents390/spinlock: fix system hang with spin_retry <= 0 (diff)
downloadlinux-dev-2bf29df7460f4038f84ac5dea3cbe582d6d4af82.tar.xz
linux-dev-2bf29df7460f4038f84ac5dea3cbe582d6d4af82.zip
s390/cio: fix multiple structure definitions
Fix multiple definitions of struct channel_path_desc by moving it to asm/chpid.h . Also change ccw_device_get_chp_desc to use proper types. Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/chsc.h')
-rw-r--r--drivers/s390/cio/chsc.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index 7e53a9c8b0b9..76c9b50700b2 100644
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -21,17 +21,6 @@ struct cmg_entry {
u32 values[NR_MEASUREMENT_ENTRIES];
} __attribute__ ((packed));
-struct channel_path_desc {
- u8 flags;
- u8 lsn;
- u8 desc;
- u8 chpid;
- u8 swla;
- u8 zeroes;
- u8 chla;
- u8 chpp;
-} __attribute__ ((packed));
-
struct channel_path_desc_fmt1 {
u8 flags;
u8 lsn;