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

Commit b1b56b93 authored by Tejun Heo's avatar Tejun Heo
Browse files

paride: Convert to bdops->check_events() 



Convert paride drivers from ->media_changed() to ->check_events().

pcd and pd buffer and clear events after reporting; however, pf
unconditionally reports MEDIA_CHANGE and will generate spurious events
when polled.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Tim Waugh <tim@cyberelk.net>
parent 1c27030b

drivers/block/paride/pcd.c

+11 −7
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ module_param_array(drive3, int, NULL, 0); 
static int pcd_open(struct cdrom_device_info *cdi, int purpose);

static void pcd_release(struct cdrom_device_info *cdi);

static int pcd_drive_status(struct cdrom_device_info *cdi, int slot_nr);

static int pcd_media_changed(struct cdrom_device_info *cdi, int slot_nr);

static unsigned int pcd_check_events(struct cdrom_device_info *cdi,

				     unsigned int clearing, int slot_nr);

static int pcd_tray_move(struct cdrom_device_info *cdi, int position);

static int pcd_lock_door(struct cdrom_device_info *cdi, int lock);

static int pcd_drive_reset(struct cdrom_device_info *cdi);
@@ -257,10 +258,11 @@ static int pcd_block_ioctl(struct block_device *bdev, fmode_t mode, 
	return ret;

}



static int pcd_block_media_changed(struct gendisk *disk)

static unsigned int pcd_block_check_events(struct gendisk *disk,

					   unsigned int clearing)

{

	struct pcd_unit *cd = disk->private_data;

	return cdrom_media_changed(&cd->info);

	return cdrom_check_events(&cd->info, clearing);

}



static const struct block_device_operations pcd_bdops = {
@@ -268,14 +270,14 @@ static const struct block_device_operations pcd_bdops = { 
	.open		= pcd_block_open,

	.release	= pcd_block_release,

	.ioctl		= pcd_block_ioctl,

	.media_changed	= pcd_block_media_changed,

	.check_events	= pcd_block_check_events,

};



static struct cdrom_device_ops pcd_dops = {

	.open		= pcd_open,

	.release	= pcd_release,

	.drive_status	= pcd_drive_status,

	.media_changed	= pcd_media_changed,

	.check_events	= pcd_check_events,

	.tray_move	= pcd_tray_move,

	.lock_door	= pcd_lock_door,

	.get_mcn	= pcd_get_mcn,
@@ -318,6 +320,7 @@ static void pcd_init_units(void) 
		disk->first_minor = unit;

		strcpy(disk->disk_name, cd->name);	/* umm... */

		disk->fops = &pcd_bdops;

		disk->events = DISK_EVENT_MEDIA_CHANGE;

	}

}
@@ -502,13 +505,14 @@ static int pcd_packet(struct cdrom_device_info *cdi, struct packet_command *cgc) 


#define DBMSG(msg)	((verbose>1)?(msg):NULL)



static int pcd_media_changed(struct cdrom_device_info *cdi, int slot_nr)

static unsigned int pcd_check_events(struct cdrom_device_info *cdi,

				     unsigned int clearing, int slot_nr)

{

	struct pcd_unit *cd = cdi->handle;

	int res = cd->changed;

	if (res)

		cd->changed = 0;

	return res;

	return res ? DISK_EVENT_MEDIA_CHANGE : 0;

}



static int pcd_lock_door(struct cdrom_device_info *cdi, int lock)

drivers/block/paride/pd.c

+4 −3
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static int pd_release(struct gendisk *p, fmode_t mode) 
	return 0;

}



static int pd_check_media(struct gendisk *p)

static unsigned int pd_check_events(struct gendisk *p, unsigned int clearing)

{

	struct pd_unit *disk = p->private_data;

	int r;
@@ -803,7 +803,7 @@ static int pd_check_media(struct gendisk *p) 
	pd_special_command(disk, pd_media_check);

	r = disk->changed;

	disk->changed = 0;

	return r;

	return r ? DISK_EVENT_MEDIA_CHANGE : 0;

}



static int pd_revalidate(struct gendisk *p)
@@ -822,7 +822,7 @@ static const struct block_device_operations pd_fops = { 
	.release	= pd_release,

	.ioctl		= pd_ioctl,

	.getgeo		= pd_getgeo,

	.media_changed	= pd_check_media,

	.check_events	= pd_check_events,

	.revalidate_disk= pd_revalidate

};
@@ -837,6 +837,7 @@ static void pd_probe_drive(struct pd_unit *disk) 
	p->fops = &pd_fops;

	p->major = major;

	p->first_minor = (disk - pd) << PD_BITS;

	p->events = DISK_EVENT_MEDIA_CHANGE;

	disk->gd = p;

	p->private_data = disk;

	p->queue = pd_queue;

drivers/block/paride/pf.c

+6 −4
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ static struct pf_unit units[PF_UNITS]; 
static int pf_identify(struct pf_unit *pf);

static void pf_lock(struct pf_unit *pf, int func);

static void pf_eject(struct pf_unit *pf);

static int pf_check_media(struct gendisk *disk);

static unsigned int pf_check_events(struct gendisk *disk,

				    unsigned int clearing);



static char pf_scratch[512];	/* scratch block buffer */
@@ -270,7 +271,7 @@ static const struct block_device_operations pf_fops = { 
	.release	= pf_release,

	.ioctl		= pf_ioctl,

	.getgeo		= pf_getgeo,

	.media_changed	= pf_check_media,

	.check_events	= pf_check_events,

};



static void __init pf_init_units(void)
@@ -293,6 +294,7 @@ static void __init pf_init_units(void) 
		disk->first_minor = unit;

		strcpy(disk->disk_name, pf->name);

		disk->fops = &pf_fops;

		disk->events = DISK_EVENT_MEDIA_CHANGE;

		if (!(*drives[unit])[D_PRT])

			pf_drive_count++;

	}
@@ -377,9 +379,9 @@ static int pf_release(struct gendisk *disk, fmode_t mode) 


}



static int pf_check_media(struct gendisk *disk)

static unsigned int pf_check_events(struct gendisk *disk, unsigned int clearing)

{

	return 1;

	return DISK_EVENT_MEDIA_CHANGE;

}



static inline int status_reg(struct pf_unit *pf)