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

Commit 7f3c868b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ide_driver_t typedef 



While at it:
- s/struct ide_driver_s/struct ide_driver/
- use to_ide_driver() macro in ide-proc.c

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

drivers/ide/ide-cd.c

+1 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,7 @@ static void ide_cd_release(struct kref *kref) 


static int ide_cd_probe(ide_drive_t *);



static ide_driver_t ide_cdrom_driver = {

static struct ide_driver ide_cdrom_driver = {

	.gen_driver = {

		.owner		= THIS_MODULE,

		.name		= "ide-cdrom",

drivers/ide/ide-cd.h

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct atapi_toc { 
/* Extra per-device info for cdrom drives. */

struct cdrom_info {

	ide_drive_t		*drive;

	ide_driver_t	*driver;

	struct ide_driver	*driver;

	struct gendisk		*disk;

	struct kref		kref;

drivers/ide/ide-gd.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int ide_gd_end_request(ide_drive_t *drive, int uptodate, int nrsecs) 
	return drive->disk_ops->end_request(drive, uptodate, nrsecs);

}



static ide_driver_t ide_gd_driver = {

static struct ide_driver ide_gd_driver = {

	.gen_driver = {

		.owner		= THIS_MODULE,

		.name		= "ide-gd",

drivers/ide/ide-gd.h

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


struct ide_disk_obj {

	ide_drive_t		*drive;

	ide_driver_t	*driver;

	struct ide_driver	*driver;

	struct gendisk		*disk;

	struct kref		kref;

	unsigned int		openers;	/* protected by BKL for now */

drivers/ide/ide-io.c

+6 −6
Original line number Diff line number Diff line
@@ -199,9 +199,9 @@ EXPORT_SYMBOL(ide_end_drive_cmd); 
static void ide_kill_rq(ide_drive_t *drive, struct request *rq)

{

	if (rq->rq_disk) {

		ide_driver_t *drv;

		struct ide_driver *drv;



		drv = *(ide_driver_t **)rq->rq_disk->private_data;

		drv = *(struct ide_driver **)rq->rq_disk->private_data;

		drv->end_request(drive, 0, 0);

	} else

		ide_end_request(drive, 0, 0);
@@ -333,9 +333,9 @@ ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, u8 stat) 
	}



	if (rq->rq_disk) {

		ide_driver_t *drv;

		struct ide_driver *drv;



		drv = *(ide_driver_t **)rq->rq_disk->private_data;

		drv = *(struct ide_driver **)rq->rq_disk->private_data;

		return drv->error(drive, rq, stat, err);

	} else

		return __ide_error(drive, rq, stat, err);
@@ -606,7 +606,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 
		return startstop;

	}

	if (!drive->special.all) {

		ide_driver_t *drv;

		struct ide_driver *drv;



		/*

		 * We reset the drive so we need to issue a SETFEATURES.
@@ -639,7 +639,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 
			 */

			return ide_special_rq(drive, rq);



		drv = *(ide_driver_t **)rq->rq_disk->private_data;

		drv = *(struct ide_driver **)rq->rq_disk->private_data;



		return drv->do_request(drive, rq, rq->sector);

	}