Merge tag 'perf-tools-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / Documentation / cdrom / cdrom-standard.rst

diff --git a/Documentation/cdrom/cdrom-standard.rst b/Documentation/cdrom/cdrom-standard.rst
index 5a13056..70500b1 100644 (file)
--- a/Documentation/cdrom/cdrom-standard.rst
+++ b/Documentation/cdrom/cdrom-standard.rst
@@ -157,7 +157,6 @@ with the kernel as a block device by registering the following general
                cdrom_release,          /∗ release ∗/
                NULL,                   /∗ fsync ∗/
                NULL,                   /∗ fasync ∗/
-               cdrom_media_changed,    /∗ media change ∗/
                NULL                    /∗ revalidate ∗/
        };
 
@@ -366,19 +365,6 @@ which may or may not be in the drive). If the drive is not a changer,
        CDS_DRIVE_NOT_READY     /* something is wrong, tray is moving? */
        CDS_DISC_OK             /* a disc is loaded and everything is fine */
 
-::
-
-       int media_changed(struct cdrom_device_info *cdi, int disc_nr)
-
-This function is very similar to the original function in $struct
-file_operations*. It returns 1 if the medium of the device *cdi->dev*
-has changed since the last call, and 0 otherwise. The parameter
-*disc_nr* identifies a specific slot in a juke-box, it should be
-ignored for single-disc drives. Note that by `re-routing` this
-function through *cdrom_media_changed()*, we can implement separate
-queues for the VFS and a new *ioctl()* function that can report device
-changes to software (e. g., an auto-mounting daemon).
-
 ::
 
        int tray_move(struct cdrom_device_info *cdi, int position)
@@ -917,9 +903,7 @@ commands can be identified by the underscores in their names.
        maximum number of discs in the juke-box found in the *cdrom_dops*.
 `CDROM_MEDIA_CHANGED`
        Returns 1 if a disc has been changed since the last call.
-       Note that calls to *cdrom_media_changed* by the VFS are treated
-       by an independent queue, so both mechanisms will detect a
-       media change once. For juke-boxes, an extra argument *arg*
+       For juke-boxes, an extra argument *arg*
        specifies the slot for which the information is given. The special
        value *CDSL_CURRENT* requests that information about the currently
        selected slot be returned.