block: avoid duplicate calls to get_part() in disk stat code

[linux-2.6-omap-h63xx.git] / include / scsi / sd.h

diff --git a/include/scsi/sd.h b/include/scsi/sd.h
index 8ea9f7358ac1dde7a8a28d9442f366304b2e2929..4f032d48cb6ec9a14b9dc2d0632981accfb0f592 100644 (file)
--- a/include/scsi/sd.h
+++ b/include/scsi/sd.h
@@ -34,7 +34,7 @@
 struct scsi_disk {
        struct scsi_driver *driver;     /* always &sd_template */
        struct scsi_device *device;
-       struct class_device cdev;
+       struct device   dev;
        struct gendisk  *disk;
        unsigned int    openers;        /* protected by BKL for now, yuck */
        sector_t        capacity;       /* size in 512-byte sectors */
@@ -46,7 +46,7 @@ struct scsi_disk {
        unsigned        RCD : 1;        /* state of disk RCD bit, unused */
        unsigned        DPOFUA : 1;     /* state of disk DPOFUA bit */
 };
-#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,cdev)
+#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)
 
 #define sd_printk(prefix, sdsk, fmt, a...)                             \
         (sdsk)->disk ?                                                 \