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

Commit 70a9755d authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

scsi/bfa: convert to idr_alloc() 



Convert to the much saner new idr interface.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Krishna C Gudipati <kgudipat@brocade.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d0ffce77

drivers/scsi/bfa/bfad_im.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -523,20 +523,13 @@ bfad_im_scsi_host_alloc(struct bfad_s *bfad, struct bfad_im_port_s *im_port, 
	int error = 1;

	int error = 1;





	mutex_lock(&bfad_mutex);

	mutex_lock(&bfad_mutex);

	if (!idr_pre_get(&bfad_im_port_index, GFP_KERNEL)) {

	error = idr_alloc(&bfad_im_port_index, im_port, 0, 0, GFP_KERNEL);

	if (error < 0) {

		mutex_unlock(&bfad_mutex);

		mutex_unlock(&bfad_mutex);

		printk(KERN_WARNING "idr_pre_get failure\n");

		printk(KERN_WARNING "idr_alloc failure\n");

		goto out;

		goto out;

	}

	}



	im_port->idr_id = error;

	error = idr_get_new(&bfad_im_port_index, im_port,

					 &im_port->idr_id);

	if (error) {

		mutex_unlock(&bfad_mutex);

		printk(KERN_WARNING "idr_get_new failure\n");

		goto out;

	}



	mutex_unlock(&bfad_mutex);

	mutex_unlock(&bfad_mutex);





	im_port->shost = bfad_scsi_host_alloc(im_port, bfad);

	im_port->shost = bfad_scsi_host_alloc(im_port, bfad);