Commit 5b635da1 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by James Bottomley
Browse files

[SCSI] sd: Move scsi_disk() accessor function to sd.h 



Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent aa91696e

drivers/scsi/sd.c

+0 −5
Original line number Diff line number Diff line
@@ -295,11 +295,6 @@ static int sd_major(int major_idx) 
	}

}



static inline struct scsi_disk *scsi_disk(struct gendisk *disk)

{

	return container_of(disk->private_data, struct scsi_disk, driver);

}



static struct scsi_disk *__scsi_disk_get(struct gendisk *disk)

{

	struct scsi_disk *sdkp = NULL;

drivers/scsi/sd.h

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ struct scsi_disk { 
};

#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)



static inline struct scsi_disk *scsi_disk(struct gendisk *disk)

{

	return container_of(disk->private_data, struct scsi_disk, driver);

}



#define sd_printk(prefix, sdsk, fmt, a...)				\

        (sdsk)->disk ?							\

	sdev_printk(prefix, (sdsk)->device, "[%s] " fmt,		\