From c23dcb54887e423e041e1f99c757907ad389907c Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 28 Dec 2010 16:20:47 +0100 Subject: [PATCH] --- yaml --- r: 231280 b: refs/heads/master c: f4013c3879d1bbd9f3ab8351185decd049502368 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 5 ----- trunk/drivers/scsi/sr.c | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1c5d5d23ceb0..a792938dbe34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bae0093cab4ee0a7a8728fdfc35b74569350863 +refs/heads/master: f4013c3879d1bbd9f3ab8351185decd049502368 diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index 7d257465bd98..e56730214c05 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -1086,13 +1086,8 @@ static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing) * * Medium present state has changed in either direction. * Device has indicated UNIT_ATTENTION. - * - * Report SDEV_EVT_MEDIA_CHANGE too for backward compatibility. */ - if (sdp->changed) - sdev_evt_send_simple(sdp, SDEV_EVT_MEDIA_CHANGE, GFP_KERNEL); kfree(sshdr); - retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0; sdp->changed = 0; return retval; diff --git a/trunk/drivers/scsi/sr.c b/trunk/drivers/scsi/sr.c index be6baf8ad704..aefadc6a1607 100644 --- a/trunk/drivers/scsi/sr.c +++ b/trunk/drivers/scsi/sr.c @@ -249,10 +249,6 @@ static unsigned int sr_check_events(struct cdrom_device_info *cdi, cd->device->changed = 0; } - /* for backward compatibility */ - if (events & DISK_EVENT_MEDIA_CHANGE) - sdev_evt_send_simple(cd->device, SDEV_EVT_MEDIA_CHANGE, - GFP_KERNEL); return events; }