SCSI: convert struct class_device to struct device
It's big, but there doesn't seem to be a way to split it up smaller... Signed-off-by: Tony Jones <tonyj@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Cc: Roland Dreier <rolandd@cisco.com> Cc: Sean Hefty <sean.hefty@intel.com> Cc: Hal Rosenstock <hal.rosenstock@gmail.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
56d110e852
commit
ee959b00c3
@@ -780,32 +780,35 @@ static int ibmvstgt_it_nexus_response(struct Scsi_Host *shost, u64 itn_id,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t system_id_show(struct class_device *cdev, char *buf)
|
||||
static ssize_t system_id_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
return snprintf(buf, PAGE_SIZE, "%s\n", system_id);
|
||||
}
|
||||
|
||||
static ssize_t partition_number_show(struct class_device *cdev, char *buf)
|
||||
static ssize_t partition_number_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
return snprintf(buf, PAGE_SIZE, "%x\n", partition_number);
|
||||
}
|
||||
|
||||
static ssize_t unit_address_show(struct class_device *cdev, char *buf)
|
||||
static ssize_t unit_address_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct Scsi_Host *shost = class_to_shost(cdev);
|
||||
struct Scsi_Host *shost = class_to_shost(dev);
|
||||
struct srp_target *target = host_to_srp_target(shost);
|
||||
struct vio_port *vport = target_to_port(target);
|
||||
return snprintf(buf, PAGE_SIZE, "%x\n", vport->dma_dev->unit_address);
|
||||
}
|
||||
|
||||
static CLASS_DEVICE_ATTR(system_id, S_IRUGO, system_id_show, NULL);
|
||||
static CLASS_DEVICE_ATTR(partition_number, S_IRUGO, partition_number_show, NULL);
|
||||
static CLASS_DEVICE_ATTR(unit_address, S_IRUGO, unit_address_show, NULL);
|
||||
static DEVICE_ATTR(system_id, S_IRUGO, system_id_show, NULL);
|
||||
static DEVICE_ATTR(partition_number, S_IRUGO, partition_number_show, NULL);
|
||||
static DEVICE_ATTR(unit_address, S_IRUGO, unit_address_show, NULL);
|
||||
|
||||
static struct class_device_attribute *ibmvstgt_attrs[] = {
|
||||
&class_device_attr_system_id,
|
||||
&class_device_attr_partition_number,
|
||||
&class_device_attr_unit_address,
|
||||
static struct device_attribute *ibmvstgt_attrs[] = {
|
||||
&dev_attr_system_id,
|
||||
&dev_attr_partition_number,
|
||||
&dev_attr_unit_address,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user