diff options
-rw-r--r-- | drivers/scsi/sd.c | 5 | ||||
-rw-r--r-- | drivers/scsi/sd.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e19691f880b9..71069d952dc7 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -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; |
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 4f032d48cb6e..03a3d45cfa42 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h | |||
@@ -48,6 +48,11 @@ struct scsi_disk { | |||
48 | }; | 48 | }; |
49 | #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev) | 49 | #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev) |
50 | 50 | ||
51 | static inline struct scsi_disk *scsi_disk(struct gendisk *disk) | ||
52 | { | ||
53 | return container_of(disk->private_data, struct scsi_disk, driver); | ||
54 | } | ||
55 | |||
51 | #define sd_printk(prefix, sdsk, fmt, a...) \ | 56 | #define sd_printk(prefix, sdsk, fmt, a...) \ |
52 | (sdsk)->disk ? \ | 57 | (sdsk)->disk ? \ |
53 | sdev_printk(prefix, (sdsk)->device, "[%s] " fmt, \ | 58 | sdev_printk(prefix, (sdsk)->device, "[%s] " fmt, \ |