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

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

s390/cio: rename struct channel_path_desc 



Rename struct channel_path_desc to struct channel_path_desc_fmt0
to fit the scheme. Provide a macro for the function wrappers that
gather this and related data from firmware.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 135a8b4c

arch/s390/include/asm/ccwdev.h

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


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



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

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

#endif /* _S390_CCWDEV_H_ */

arch/s390/include/asm/chpid.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <uapi/asm/chpid.h>

#include <asm/cio.h>



struct channel_path_desc {

struct channel_path_desc_fmt0 {

	u8 flags;

	u8 lsn;

	u8 desc;

drivers/s390/block/dasd_eckd.c

+1 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ static int dasd_eckd_read_conf(struct dasd_device *device) 
	struct dasd_eckd_private *private, path_private;

	struct dasd_uid *uid;

	char print_path_uid[60], print_device_uid[60];

	struct channel_path_desc *chp_desc;

	struct channel_path_desc_fmt0 *chp_desc;

	struct subchannel_id sch_id;



	private = device->private;

drivers/s390/cio/chp.c

+5 −5
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ int chp_update_desc(struct channel_path *chp) 
{

	int rc;



	rc = chsc_determine_base_channel_path_desc(chp->chpid, &chp->desc);

	rc = chsc_determine_fmt0_channel_path_desc(chp->chpid, &chp->desc);

	if (rc)

		return rc;
@@ -506,20 +506,20 @@ 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.

 */

struct channel_path_desc *chp_get_chp_desc(struct chp_id chpid)

struct channel_path_desc_fmt0 *chp_get_chp_desc(struct chp_id chpid)

{

	struct channel_path *chp;

	struct channel_path_desc *desc;

	struct channel_path_desc_fmt0 *desc;



	chp = chpid_to_chp(chpid);

	if (!chp)

		return NULL;

	desc = kmalloc(sizeof(struct channel_path_desc), GFP_KERNEL);

	desc = kmalloc(sizeof(*desc), GFP_KERNEL);

	if (!desc)

		return NULL;



	mutex_lock(&chp->lock);

	memcpy(desc, &chp->desc, sizeof(struct channel_path_desc));

	memcpy(desc, &chp->desc, sizeof(*desc));

	mutex_unlock(&chp->lock);

	return desc;

}

drivers/s390/cio/chp.h

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct channel_path { 
	struct chp_id chpid;

	struct mutex lock; /* Serialize access to below members. */

	int state;

	struct channel_path_desc desc;

	struct channel_path_desc_fmt0 desc;

	struct channel_path_desc_fmt1 desc_fmt1;

	/* Channel-measurement related stuff: */

	int cmg;
@@ -61,7 +61,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);

struct channel_path_desc *chp_get_chp_desc(struct chp_id chpid);

struct channel_path_desc_fmt0 *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);