---

yaml --- r: 231553 b: refs/heads/master c: 140e300 h: refs/heads/master i: 231551: 4a8433c v: v3
git-mirror · Jan 4, 2011 · 21e4504 · 21e4504
1 parent d959703
commit 21e4504
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eface65c336eff420d70beb0fb6787a732e05ffb
+refs/heads/master: 140e3008e7fe1526cbb12f8f07dbc273ac713b75
diff --git 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
@@ -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;
 }