Merge tag 'drm-next-2022-03-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / scsi / sr.h

diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h
index 339c624..1175f2e 100644 (file)
--- a/drivers/scsi/sr.h
+++ b/drivers/scsi/sr.h
@@ -18,8 +18,6 @@
 #ifndef _SR_H
 #define _SR_H
 
-#include <linux/genhd.h>
-#include <linux/kref.h>
 #include <linux/mutex.h>
 
 #define MAX_RETRIES    3
@@ -33,7 +31,6 @@ struct scsi_device;
 
 
 typedef struct scsi_cd {
-       struct scsi_driver *driver;
        unsigned capacity;      /* size in blocks                       */
        struct scsi_device *device;
        unsigned int vendor;    /* vendor code, see sr_vendor.c         */
@@ -53,9 +50,6 @@ typedef struct scsi_cd {
 
        struct cdrom_device_info cdi;
        struct mutex lock;
-       /* We hold gendisk and scsi_device references on probe and use
-        * the refs on this kref to decide when to release them */
-       struct kref kref;
        struct gendisk *disk;
 } Scsi_CD;