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

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

s390/dasd: remove casts to dasd_*_private 



Convert dasd_device.private to be a void pointer to get
rid of a lot of explicit casts.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: default avatarStefan Haberland <sth@linux.vnet.ibm.com>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 570d237c

drivers/s390/block/dasd_alias.c

+20 −35
Original line number Diff line number Diff line
@@ -185,14 +185,12 @@ static void _free_lcu(struct alias_lcu *lcu) 
 */

int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)

{

	struct dasd_eckd_private *private;

	struct dasd_eckd_private *private = device->private;

	unsigned long flags;

	struct alias_server *server, *newserver;

	struct alias_lcu *lcu, *newlcu;

	struct dasd_uid uid;



	private = (struct dasd_eckd_private *) device->private;



	device->discipline->get_uid(device, &uid);

	spin_lock_irqsave(&aliastree.lock, flags);

	server = _find_server(&uid);
@@ -244,14 +242,13 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device) 
 */

void dasd_alias_disconnect_device_from_lcu(struct dasd_device *device)

{

	struct dasd_eckd_private *private;

	struct dasd_eckd_private *private = device->private;

	unsigned long flags;

	struct alias_lcu *lcu;

	struct alias_server *server;

	int was_pending;

	struct dasd_uid uid;



	private = (struct dasd_eckd_private *) device->private;

	lcu = private->lcu;

	/* nothing to do if already disconnected */

	if (!lcu)
@@ -316,12 +313,10 @@ static int _add_device_to_lcu(struct alias_lcu *lcu, 
			      struct dasd_device *pos)

{



	struct dasd_eckd_private *private;

	struct dasd_eckd_private *private = device->private;

	struct alias_pav_group *group;

	struct dasd_uid uid;



	private = (struct dasd_eckd_private *) device->private;



	private->uid.type = lcu->uac->unit[private->uid.real_unit_addr].ua_type;

	private->uid.base_unit_addr =

		lcu->uac->unit[private->uid.real_unit_addr].base_ua;
@@ -362,10 +357,9 @@ static int _add_device_to_lcu(struct alias_lcu *lcu, 
static void _remove_device_from_lcu(struct alias_lcu *lcu,

				    struct dasd_device *device)

{

	struct dasd_eckd_private *private;

	struct dasd_eckd_private *private = device->private;

	struct alias_pav_group *group;



	private = (struct dasd_eckd_private *) device->private;

	list_move(&device->alias_list, &lcu->inactive_devices);

	group = private->pavgroup;

	if (!group)
@@ -603,13 +597,13 @@ static int _lcu_update(struct dasd_device *refdev, struct alias_lcu *lcu) 
		list_for_each_entry_safe(device, tempdev, &pavgroup->baselist,

					 alias_list) {

			list_move(&device->alias_list, &lcu->active_devices);

			private = (struct dasd_eckd_private *) device->private;

			private = device->private;

			private->pavgroup = NULL;

		}

		list_for_each_entry_safe(device, tempdev, &pavgroup->aliaslist,

					 alias_list) {

			list_move(&device->alias_list, &lcu->active_devices);

			private = (struct dasd_eckd_private *) device->private;

			private = device->private;

			private->pavgroup = NULL;

		}

		list_del(&pavgroup->group);
@@ -721,12 +715,11 @@ static int _schedule_lcu_update(struct alias_lcu *lcu, 


int dasd_alias_add_device(struct dasd_device *device)

{

	struct dasd_eckd_private *private;

	struct dasd_eckd_private *private = device->private;

	struct alias_lcu *lcu;

	unsigned long flags;

	int rc;



	private = (struct dasd_eckd_private *) device->private;

	lcu = private->lcu;

	rc = 0;

	spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
@@ -747,20 +740,18 @@ int dasd_alias_add_device(struct dasd_device *device) 


int dasd_alias_update_add_device(struct dasd_device *device)

{

	struct dasd_eckd_private *private;

	private = (struct dasd_eckd_private *) device->private;

	struct dasd_eckd_private *private = device->private;



	private->lcu->flags |= UPDATE_PENDING;

	return dasd_alias_add_device(device);

}



int dasd_alias_remove_device(struct dasd_device *device)

{

	struct dasd_eckd_private *private;

	struct alias_lcu *lcu;

	struct dasd_eckd_private *private = device->private;

	struct alias_lcu *lcu = private->lcu;

	unsigned long flags;



	private = (struct dasd_eckd_private *) device->private;

	lcu = private->lcu;

	/* nothing to do if already removed */

	if (!lcu)

		return 0;
@@ -772,16 +763,12 @@ int dasd_alias_remove_device(struct dasd_device *device) 


struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)

{



	struct dasd_eckd_private *alias_priv, *private = base_device->private;

	struct alias_pav_group *group = private->pavgroup;

	struct alias_lcu *lcu = private->lcu;

	struct dasd_device *alias_device;

	struct alias_pav_group *group;

	struct alias_lcu *lcu;

	struct dasd_eckd_private *private, *alias_priv;

	unsigned long flags;



	private = (struct dasd_eckd_private *) base_device->private;

	group = private->pavgroup;

	lcu = private->lcu;

	if (!group || !lcu)

		return NULL;

	if (lcu->pav == NO_PAV ||
@@ -817,7 +804,7 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device) 
		group->next = list_first_entry(&alias_device->alias_list,

					       struct dasd_device, alias_list);

	spin_unlock_irqrestore(&lcu->lock, flags);

	alias_priv = (struct dasd_eckd_private *) alias_device->private;

	alias_priv = alias_device->private;

	if ((alias_priv->count < private->count) && !alias_device->stopped &&

	    !test_bit(DASD_FLAG_OFFLINE, &alias_device->flags))

		return alias_device;
@@ -868,14 +855,14 @@ static void _restart_all_base_devices_on_lcu(struct alias_lcu *lcu) 


	/* active and inactive list can contain alias as well as base devices */

	list_for_each_entry(device, &lcu->active_devices, alias_list) {

		private = (struct dasd_eckd_private *) device->private;

		private = device->private;

		if (private->uid.type != UA_BASE_DEVICE)

			continue;

		dasd_schedule_block_bh(device->block);

		dasd_schedule_device_bh(device);

	}

	list_for_each_entry(device, &lcu->inactive_devices, alias_list) {

		private = (struct dasd_eckd_private *) device->private;

		private = device->private;

		if (private->uid.type != UA_BASE_DEVICE)

			continue;

		dasd_schedule_block_bh(device->block);
@@ -912,7 +899,7 @@ static void flush_all_alias_devices_on_lcu(struct alias_lcu *lcu) 
	spin_lock_irqsave(&lcu->lock, flags);

	list_for_each_entry_safe(device, temp, &lcu->active_devices,

				 alias_list) {

		private = (struct dasd_eckd_private *) device->private;

		private = device->private;

		if (private->uid.type == UA_BASE_DEVICE)

			continue;

		list_move(&device->alias_list, &active);
@@ -934,7 +921,7 @@ static void flush_all_alias_devices_on_lcu(struct alias_lcu *lcu) 
		if (device == list_first_entry(&active,

					       struct dasd_device, alias_list)) {

			list_move(&device->alias_list, &lcu->active_devices);

			private = (struct dasd_eckd_private *) device->private;

			private = device->private;

			private->pavgroup = NULL;

		}

	}
@@ -1014,13 +1001,11 @@ static void summary_unit_check_handling_work(struct work_struct *work) 
void dasd_alias_handle_summary_unit_check(struct dasd_device *device,

					  struct irb *irb)

{

	struct dasd_eckd_private *private = device->private;

	struct alias_lcu *lcu;

	char reason;

	struct dasd_eckd_private *private;

	char *sense;



	private = (struct dasd_eckd_private *) device->private;



	sense = dasd_get_sense(irb);

	if (sense) {

		reason = sense[8];

drivers/s390/block/dasd_diag.c

+17 −24
Original line number Diff line number Diff line
@@ -99,12 +99,10 @@ static inline int 
mdsk_init_io(struct dasd_device *device, unsigned int blocksize,

	     blocknum_t offset, blocknum_t *end_block)

{

	struct dasd_diag_private *private;

	struct dasd_diag_init_io *iib;

	struct dasd_diag_private *private = device->private;

	struct dasd_diag_init_io *iib = &private->iib;

	int rc;



	private = (struct dasd_diag_private *) device->private;

	iib = &private->iib;

	memset(iib, 0, sizeof (struct dasd_diag_init_io));



	iib->dev_nr = private->dev_id.devno;
@@ -125,12 +123,10 @@ mdsk_init_io(struct dasd_device *device, unsigned int blocksize, 
static inline int

mdsk_term_io(struct dasd_device * device)

{

	struct dasd_diag_private *private;

	struct dasd_diag_init_io *iib;

	struct dasd_diag_private *private = device->private;

	struct dasd_diag_init_io *iib = &private->iib;

	int rc;



	private = (struct dasd_diag_private *) device->private;

	iib = &private->iib;

	memset(iib, 0, sizeof (struct dasd_diag_init_io));

	iib->dev_nr = private->dev_id.devno;

	rc = dia250(iib, TERM_BIO);
@@ -175,8 +171,8 @@ dasd_start_diag(struct dasd_ccw_req * cqr) 
		cqr->status = DASD_CQR_ERROR;

		return -EIO;

	}

	private = (struct dasd_diag_private *) device->private;

	dreq = (struct dasd_diag_req *) cqr->data;

	private = device->private;

	dreq = cqr->data;



	private->iob.dev_nr = private->dev_id.devno;

	private->iob.key = 0;
@@ -315,18 +311,17 @@ static void dasd_ext_handler(struct ext_code ext_code, 
static int

dasd_diag_check_device(struct dasd_device *device)

{

	struct dasd_block *block;

	struct dasd_diag_private *private;

	struct dasd_diag_private *private = device->private;

	struct dasd_diag_characteristics *rdc_data;

	struct dasd_diag_bio bio;

	struct vtoc_cms_label *label;

	blocknum_t end_block;

	struct dasd_block *block;

	struct dasd_diag_bio bio;

	unsigned int sb, bsize;

	blocknum_t end_block;

	int rc;



	private = (struct dasd_diag_private *) device->private;

	if (private == NULL) {

		private = kzalloc(sizeof(struct dasd_diag_private),GFP_KERNEL);

		private = kzalloc(sizeof(*private), GFP_KERNEL);

		if (private == NULL) {

			DBF_DEV_EVENT(DBF_WARNING, device, "%s",

				"Allocating memory for private DASD data "
@@ -334,7 +329,7 @@ dasd_diag_check_device(struct dasd_device *device) 
			return -ENOMEM;

		}

		ccw_device_get_id(device->cdev, &private->dev_id);

		device->private = (void *) private;

		device->private = private;

	}

	block = dasd_alloc_block();

	if (IS_ERR(block)) {
@@ -348,7 +343,7 @@ dasd_diag_check_device(struct dasd_device *device) 
	block->base = device;



	/* Read Device Characteristics */

	rdc_data = (void *) &(private->rdc_data);

	rdc_data = &private->rdc_data;

	rdc_data->dev_nr = private->dev_id.devno;

	rdc_data->rdc_len = sizeof (struct dasd_diag_characteristics);
@@ -596,16 +591,14 @@ static int 
dasd_diag_fill_info(struct dasd_device * device,

		    struct dasd_information2_t * info)

{

	struct dasd_diag_private *private;

	struct dasd_diag_private *private = device->private;



	private = (struct dasd_diag_private *) device->private;

	info->label_block = (unsigned int) private->pt_block;

	info->FBA_layout = 1;

	info->format = DASD_FORMAT_LDL;

	info->characteristics_size = sizeof (struct dasd_diag_characteristics);

	memcpy(info->characteristics,

	       &((struct dasd_diag_private *) device->private)->rdc_data,

	       sizeof (struct dasd_diag_characteristics));

	info->characteristics_size = sizeof(private->rdc_data);

	memcpy(info->characteristics, &private->rdc_data,

	       sizeof(private->rdc_data));

	info->confdata_size = 0;

	return 0;

}

drivers/s390/block/dasd_eckd.c

+56 −105

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/block/dasd_fba.c

+12 −16
Original line number Diff line number Diff line
@@ -125,13 +125,11 @@ locate_record(struct ccw1 * ccw, struct LO_fba_data *data, int rw, 
static int

dasd_fba_check_characteristics(struct dasd_device *device)

{

	struct dasd_block *block;

	struct dasd_fba_private *private;

	struct dasd_fba_private *private = device->private;

	struct ccw_device *cdev = device->cdev;

	int rc;

	int readonly;

	struct dasd_block *block;

	int readonly, rc;



	private = (struct dasd_fba_private *) device->private;

	if (!private) {

		private = kzalloc(sizeof(*private), GFP_KERNEL | GFP_DMA);

		if (!private) {
@@ -140,7 +138,7 @@ dasd_fba_check_characteristics(struct dasd_device *device) 
				 "data failed\n");

			return -ENOMEM;

		}

		device->private = (void *) private;

		device->private = private;

	} else {

		memset(private, 0, sizeof(*private));

	}
@@ -192,10 +190,9 @@ dasd_fba_check_characteristics(struct dasd_device *device) 


static int dasd_fba_do_analysis(struct dasd_block *block)

{

	struct dasd_fba_private *private;

	struct dasd_fba_private *private = block->base->private;

	int sb, rc;



	private = (struct dasd_fba_private *) block->base->private;

	rc = dasd_check_blocksize(private->rdc_data.blk_size);

	if (rc) {

		DBF_DEV_EVENT(DBF_WARNING, block->base, "unknown blocksize %d",
@@ -254,7 +251,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, 
					      struct dasd_block *block,

					      struct request *req)

{

	struct dasd_fba_private *private;

	struct dasd_fba_private *private = block->base->private;

	unsigned long *idaws;

	struct LO_fba_data *LO_data;

	struct dasd_ccw_req *cqr;
@@ -267,7 +264,6 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, 
	unsigned int blksize, off;

	unsigned char cmd;



	private = (struct dasd_fba_private *) block->base->private;

	if (rq_data_dir(req) == READ) {

		cmd = DASD_FBA_CCW_READ;

	} else if (rq_data_dir(req) == WRITE) {
@@ -379,7 +375,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, 
static int

dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req)

{

	struct dasd_fba_private *private;

	struct dasd_fba_private *private = cqr->block->base->private;

	struct ccw1 *ccw;

	struct req_iterator iter;

	struct bio_vec bv;
@@ -389,7 +385,6 @@ dasd_fba_free_cp(struct dasd_ccw_req *cqr, struct request *req) 


	if (!dasd_page_cache)

		goto out;

	private = (struct dasd_fba_private *) cqr->block->base->private;

	blksize = cqr->block->bp_block;

	ccw = cqr->cpaddr;

	/* Skip over define extent & locate record. */
@@ -436,13 +431,14 @@ static int 
dasd_fba_fill_info(struct dasd_device * device,

		   struct dasd_information2_t * info)

{

	struct dasd_fba_private *private = device->private;



	info->label_block = 1;

	info->FBA_layout = 1;

	info->format = DASD_FORMAT_LDL;

	info->characteristics_size = sizeof(struct dasd_fba_characteristics);

	memcpy(info->characteristics,

	       &((struct dasd_fba_private *) device->private)->rdc_data,

	       sizeof (struct dasd_fba_characteristics));

	info->characteristics_size = sizeof(private->rdc_data);

	memcpy(info->characteristics, &private->rdc_data,

	       sizeof(private->rdc_data));

	info->confdata_size = 0;

	return 0;

}

drivers/s390/block/dasd_int.h

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ struct dasd_device { 
	/* Device discipline stuff. */

	struct dasd_discipline *discipline;

	struct dasd_discipline *base_discipline;

	char *private;

	void *private;

	struct dasd_path path_data;



	/* Device state and target state. */