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

Commit 08da591e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ide_device_{get,put}() helpers 



* Add 'struct ide_host *host' field to ide_hwif_t and set it
  in ide_host_alloc_all().

* Add ide_device_{get,put}() helpers loosely based on SCSI's
  scsi_device_{get,put}() ones.

* Convert IDE device drivers to use ide_device_{get,put}().

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 6cdf6eb3

drivers/ide/ide-cd.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -57,23 +57,29 @@ static DEFINE_MUTEX(idecd_ref_mutex); 
#define ide_cd_g(disk) \

#define ide_cd_g(disk) \

	container_of((disk)->private_data, struct cdrom_info, driver)

	container_of((disk)->private_data, struct cdrom_info, driver)





static void ide_cd_release(struct kref *);



static struct cdrom_info *ide_cd_get(struct gendisk *disk)

static struct cdrom_info *ide_cd_get(struct gendisk *disk)

{

{

	struct cdrom_info *cd = NULL;

	struct cdrom_info *cd = NULL;





	mutex_lock(&idecd_ref_mutex);

	mutex_lock(&idecd_ref_mutex);

	cd = ide_cd_g(disk);

	cd = ide_cd_g(disk);

	if (cd)

	if (cd) {

		kref_get(&cd->kref);

		kref_get(&cd->kref);

		if (ide_device_get(cd->drive)) {

			kref_put(&cd->kref, ide_cd_release);

			cd = NULL;

		}

	}

	mutex_unlock(&idecd_ref_mutex);

	mutex_unlock(&idecd_ref_mutex);

	return cd;

	return cd;

}

}





static void ide_cd_release(struct kref *);



static void ide_cd_put(struct cdrom_info *cd)

static void ide_cd_put(struct cdrom_info *cd)

{

{

	mutex_lock(&idecd_ref_mutex);

	mutex_lock(&idecd_ref_mutex);

	ide_device_put(cd->drive);

	kref_put(&cd->kref, ide_cd_release);

	kref_put(&cd->kref, ide_cd_release);

	mutex_unlock(&idecd_ref_mutex);

	mutex_unlock(&idecd_ref_mutex);

}

}

drivers/ide/ide-disk.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -56,23 +56,29 @@ static DEFINE_MUTEX(idedisk_ref_mutex); 
#define ide_disk_g(disk) \

#define ide_disk_g(disk) \

	container_of((disk)->private_data, struct ide_disk_obj, driver)

	container_of((disk)->private_data, struct ide_disk_obj, driver)





static void ide_disk_release(struct kref *);



static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)

static struct ide_disk_obj *ide_disk_get(struct gendisk *disk)

{

{

	struct ide_disk_obj *idkp = NULL;

	struct ide_disk_obj *idkp = NULL;





	mutex_lock(&idedisk_ref_mutex);

	mutex_lock(&idedisk_ref_mutex);

	idkp = ide_disk_g(disk);

	idkp = ide_disk_g(disk);

	if (idkp)

	if (idkp) {

		kref_get(&idkp->kref);

		kref_get(&idkp->kref);

		if (ide_device_get(idkp->drive)) {

			kref_put(&idkp->kref, ide_disk_release);

			idkp = NULL;

		}

	}

	mutex_unlock(&idedisk_ref_mutex);

	mutex_unlock(&idedisk_ref_mutex);

	return idkp;

	return idkp;

}

}





static void ide_disk_release(struct kref *);



static void ide_disk_put(struct ide_disk_obj *idkp)

static void ide_disk_put(struct ide_disk_obj *idkp)

{

{

	mutex_lock(&idedisk_ref_mutex);

	mutex_lock(&idedisk_ref_mutex);

	ide_device_put(idkp->drive);

	kref_put(&idkp->kref, ide_disk_release);

	kref_put(&idkp->kref, ide_disk_release);

	mutex_unlock(&idedisk_ref_mutex);

	mutex_unlock(&idedisk_ref_mutex);

}

}

drivers/ide/ide-floppy.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -158,23 +158,29 @@ static DEFINE_MUTEX(idefloppy_ref_mutex); 
#define ide_floppy_g(disk) \

#define ide_floppy_g(disk) \

	container_of((disk)->private_data, struct ide_floppy_obj, driver)

	container_of((disk)->private_data, struct ide_floppy_obj, driver)





static void idefloppy_cleanup_obj(struct kref *);



static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)

static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk)

{

{

	struct ide_floppy_obj *floppy = NULL;

	struct ide_floppy_obj *floppy = NULL;





	mutex_lock(&idefloppy_ref_mutex);

	mutex_lock(&idefloppy_ref_mutex);

	floppy = ide_floppy_g(disk);

	floppy = ide_floppy_g(disk);

	if (floppy)

	if (floppy) {

		kref_get(&floppy->kref);

		kref_get(&floppy->kref);

		if (ide_device_get(floppy->drive)) {

			kref_put(&floppy->kref, idefloppy_cleanup_obj);

			floppy = NULL;

		}

	}

	mutex_unlock(&idefloppy_ref_mutex);

	mutex_unlock(&idefloppy_ref_mutex);

	return floppy;

	return floppy;

}

}





static void idefloppy_cleanup_obj(struct kref *);



static void ide_floppy_put(struct ide_floppy_obj *floppy)

static void ide_floppy_put(struct ide_floppy_obj *floppy)

{

{

	mutex_lock(&idefloppy_ref_mutex);

	mutex_lock(&idefloppy_ref_mutex);

	ide_device_put(floppy->drive);

	kref_put(&floppy->kref, idefloppy_cleanup_obj);

	kref_put(&floppy->kref, idefloppy_cleanup_obj);

	mutex_unlock(&idefloppy_ref_mutex);

	mutex_unlock(&idefloppy_ref_mutex);

}

}

drivers/ide/ide-probe.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1595,6 +1595,8 @@ struct ide_host *ide_host_alloc_all(const struct ide_port_info *d, 




		ide_init_port_data(hwif, idx);

		ide_init_port_data(hwif, idx);





		hwif->host = host;



		host->ports[i] = hwif;

		host->ports[i] = hwif;

		host->n_ports++;

		host->n_ports++;

	}

	}

drivers/ide/ide-tape.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -322,23 +322,29 @@ static struct class *idetape_sysfs_class; 
#define ide_tape_g(disk) \

#define ide_tape_g(disk) \

	container_of((disk)->private_data, struct ide_tape_obj, driver)

	container_of((disk)->private_data, struct ide_tape_obj, driver)





static void ide_tape_release(struct kref *);



static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)

static struct ide_tape_obj *ide_tape_get(struct gendisk *disk)

{

{

	struct ide_tape_obj *tape = NULL;

	struct ide_tape_obj *tape = NULL;





	mutex_lock(&idetape_ref_mutex);

	mutex_lock(&idetape_ref_mutex);

	tape = ide_tape_g(disk);

	tape = ide_tape_g(disk);

	if (tape)

	if (tape) {

		kref_get(&tape->kref);

		kref_get(&tape->kref);

		if (ide_device_get(tape->drive)) {

			kref_put(&tape->kref, ide_tape_release);

			tape = NULL;

		}

	}

	mutex_unlock(&idetape_ref_mutex);

	mutex_unlock(&idetape_ref_mutex);

	return tape;

	return tape;

}

}





static void ide_tape_release(struct kref *);



static void ide_tape_put(struct ide_tape_obj *tape)

static void ide_tape_put(struct ide_tape_obj *tape)

{

{

	mutex_lock(&idetape_ref_mutex);

	mutex_lock(&idetape_ref_mutex);

	ide_device_put(tape->drive);

	kref_put(&tape->kref, ide_tape_release);

	kref_put(&tape->kref, ide_tape_release);

	mutex_unlock(&idetape_ref_mutex);

	mutex_unlock(&idetape_ref_mutex);

}

}