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

Commit 2bf29df7 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

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: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2e4006b3

arch/s390/include/asm/ccwdev.h

+1 −1
Original line number Diff line number Diff line
@@ -229,5 +229,5 @@ int ccw_device_siosl(struct ccw_device *); 


extern void ccw_device_get_schid(struct ccw_device *, struct subchannel_id *);



extern void *ccw_device_get_chp_desc(struct ccw_device *, int);

struct channel_path_desc *ccw_device_get_chp_desc(struct ccw_device *, int);

#endif /* _S390_CCWDEV_H_ */

arch/s390/include/asm/chpid.h

+11 −0
Original line number Diff line number Diff line
@@ -8,6 +8,17 @@ 
#include <uapi/asm/chpid.h>

#include <asm/cio.h>



struct channel_path_desc {

	u8 flags;

	u8 lsn;

	u8 desc;

	u8 chpid;

	u8 swla;

	u8 zeroes;

	u8 chla;

	u8 chpp;

} __packed;



static inline void chp_id_init(struct chp_id *chpid)

{

	memset(chpid, 0, sizeof(struct chp_id));

drivers/s390/cio/chp.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ int chp_new(struct chp_id chpid) 
 * 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;

drivers/s390/cio/chp.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline struct channel_path *chpid_to_chp(struct chp_id chpid) 
int chp_get_status(struct chp_id chpid);

u8 chp_get_sch_opm(struct subchannel *sch);

int chp_is_registered(struct chp_id chpid);

void *chp_get_chp_desc(struct chp_id chpid);

struct channel_path_desc *chp_get_chp_desc(struct chp_id chpid);

void chp_remove_cmg_attr(struct channel_path *chp);

int chp_add_cmg_attr(struct channel_path *chp);

int chp_update_desc(struct channel_path *chp);

drivers/s390/cio/chsc.h

+0 −11
Original line number Diff line number Diff line
@@ -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;