diff options
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r-- | drivers/scsi/sd.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index d53312c42547..0c63947d8a9d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -58,8 +58,8 @@ | |||
58 | #include <scsi/scsi_host.h> | 58 | #include <scsi/scsi_host.h> |
59 | #include <scsi/scsi_ioctl.h> | 59 | #include <scsi/scsi_ioctl.h> |
60 | #include <scsi/scsicam.h> | 60 | #include <scsi/scsicam.h> |
61 | #include <scsi/sd.h> | ||
62 | 61 | ||
62 | #include "sd.h" | ||
63 | #include "scsi_logging.h" | 63 | #include "scsi_logging.h" |
64 | 64 | ||
65 | MODULE_AUTHOR("Eric Youngdale"); | 65 | MODULE_AUTHOR("Eric Youngdale"); |
@@ -295,11 +295,6 @@ static int sd_major(int major_idx) | |||
295 | } | 295 | } |
296 | } | 296 | } |
297 | 297 | ||
298 | static inline struct scsi_disk *scsi_disk(struct gendisk *disk) | ||
299 | { | ||
300 | return container_of(disk->private_data, struct scsi_disk, driver); | ||
301 | } | ||
302 | |||
303 | static struct scsi_disk *__scsi_disk_get(struct gendisk *disk) | 298 | static struct scsi_disk *__scsi_disk_get(struct gendisk *disk) |
304 | { | 299 | { |
305 | struct scsi_disk *sdkp = NULL; | 300 | struct scsi_disk *sdkp = NULL; |