summaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/chp.c
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/chp.c
parent2e4006b34d06681ed95d55510d4450f29a13c417 (diff)
downloadop-kernel-dev-2bf29df7460f4038f84ac5dea3cbe582d6d4af82.zip
op-kernel-dev-2bf29df7460f4038f84ac5dea3cbe582d6d4af82.tar.gz
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/chp.c')
-rw-r--r--drivers/s390/cio/chp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 6c440d4..d497aa0 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -509,7 +509,7 @@ out:
* On success return a newly allocated copy of the channel-path description
* data associated with the given channel-path ID. Return %NULL on error.
*/
-void *chp_get_chp_desc(struct chp_id chpid)
+struct channel_path_desc *chp_get_chp_desc(struct chp_id chpid)
{
struct channel_path *chp;
struct channel_path_desc *desc;
OpenPOWER on IntegriCloud