Commit 9e7bd945 authored by Guosong Su's avatar Guosong Su Committed by Martin K. Petersen
Browse files

scsi: core: use kobj_to_dev 

Use kobj_to_dev to instead of open-coding it.

Link: https://lore.kernel.org/r/20200225100411.10250-1-guosongsu@gmail.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarGuosong Su <suguosong@xiaomi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b3222c32

drivers/scsi/scsi_sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ show_vpd_##_page(struct file *filp, struct kobject *kobj, \ 
		 struct bin_attribute *bin_attr,			\

		 char *buf, loff_t off, size_t count)			\

{									\

	struct device *dev = container_of(kobj, struct device, kobj);	\

	struct device *dev = kobj_to_dev(kobj);				\

	struct scsi_device *sdev = to_scsi_device(dev);			\

	struct scsi_vpd *vpd_page;					\

	int ret = -EINVAL;						\
@@ -884,7 +884,7 @@ static ssize_t show_inquiry(struct file *filep, struct kobject *kobj, 
			    struct bin_attribute *bin_attr,

			    char *buf, loff_t off, size_t count)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct device *dev = kobj_to_dev(kobj);

	struct scsi_device *sdev = to_scsi_device(dev);



	if (!sdev->inquiry)
@@ -1181,7 +1181,7 @@ static DEVICE_ATTR(queue_ramp_up_period, S_IRUGO | S_IWUSR, 
static umode_t scsi_sdev_attr_is_visible(struct kobject *kobj,

					 struct attribute *attr, int i)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct device *dev = kobj_to_dev(kobj);

	struct scsi_device *sdev = to_scsi_device(dev);
@@ -1207,7 +1207,7 @@ static umode_t scsi_sdev_attr_is_visible(struct kobject *kobj, 
static umode_t scsi_sdev_bin_attr_is_visible(struct kobject *kobj,

					     struct bin_attribute *attr, int i)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct device *dev = kobj_to_dev(kobj);

	struct scsi_device *sdev = to_scsi_device(dev);