mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-22 22:11:38 +08:00
scsi: csiostor: Switch to attribute groups
struct device supports attribute groups directly but does not support struct device_attribute directly. Hence switch to attribute groups. Link: https://lore.kernel.org/r/20211012233558.4066756-18-bvanassche@acm.org Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
eb78ac7a54
commit
623cf762c7
@ -1460,14 +1460,16 @@ static DEVICE_ATTR(disable_port, S_IWUSR, NULL, csio_disable_port);
|
|||||||
static DEVICE_ATTR(dbg_level, S_IRUGO | S_IWUSR, csio_show_dbg_level,
|
static DEVICE_ATTR(dbg_level, S_IRUGO | S_IWUSR, csio_show_dbg_level,
|
||||||
csio_store_dbg_level);
|
csio_store_dbg_level);
|
||||||
|
|
||||||
static struct device_attribute *csio_fcoe_lport_attrs[] = {
|
static struct attribute *csio_fcoe_lport_attrs[] = {
|
||||||
&dev_attr_hw_state,
|
&dev_attr_hw_state.attr,
|
||||||
&dev_attr_device_reset,
|
&dev_attr_device_reset.attr,
|
||||||
&dev_attr_disable_port,
|
&dev_attr_disable_port.attr,
|
||||||
&dev_attr_dbg_level,
|
&dev_attr_dbg_level.attr,
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ATTRIBUTE_GROUPS(csio_fcoe_lport);
|
||||||
|
|
||||||
static ssize_t
|
static ssize_t
|
||||||
csio_show_num_reg_rnodes(struct device *dev,
|
csio_show_num_reg_rnodes(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
@ -1479,12 +1481,14 @@ csio_show_num_reg_rnodes(struct device *dev,
|
|||||||
|
|
||||||
static DEVICE_ATTR(num_reg_rnodes, S_IRUGO, csio_show_num_reg_rnodes, NULL);
|
static DEVICE_ATTR(num_reg_rnodes, S_IRUGO, csio_show_num_reg_rnodes, NULL);
|
||||||
|
|
||||||
static struct device_attribute *csio_fcoe_vport_attrs[] = {
|
static struct attribute *csio_fcoe_vport_attrs[] = {
|
||||||
&dev_attr_num_reg_rnodes,
|
&dev_attr_num_reg_rnodes.attr,
|
||||||
&dev_attr_dbg_level,
|
&dev_attr_dbg_level.attr,
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ATTRIBUTE_GROUPS(csio_fcoe_vport);
|
||||||
|
|
||||||
static inline uint32_t
|
static inline uint32_t
|
||||||
csio_scsi_copy_to_sgl(struct csio_hw *hw, struct csio_ioreq *req)
|
csio_scsi_copy_to_sgl(struct csio_hw *hw, struct csio_ioreq *req)
|
||||||
{
|
{
|
||||||
@ -2277,7 +2281,7 @@ struct scsi_host_template csio_fcoe_shost_template = {
|
|||||||
.this_id = -1,
|
.this_id = -1,
|
||||||
.sg_tablesize = CSIO_SCSI_MAX_SGE,
|
.sg_tablesize = CSIO_SCSI_MAX_SGE,
|
||||||
.cmd_per_lun = CSIO_MAX_CMD_PER_LUN,
|
.cmd_per_lun = CSIO_MAX_CMD_PER_LUN,
|
||||||
.shost_attrs = csio_fcoe_lport_attrs,
|
.shost_groups = csio_fcoe_lport_groups,
|
||||||
.max_sectors = CSIO_MAX_SECTOR_SIZE,
|
.max_sectors = CSIO_MAX_SECTOR_SIZE,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -2296,7 +2300,7 @@ struct scsi_host_template csio_fcoe_shost_vport_template = {
|
|||||||
.this_id = -1,
|
.this_id = -1,
|
||||||
.sg_tablesize = CSIO_SCSI_MAX_SGE,
|
.sg_tablesize = CSIO_SCSI_MAX_SGE,
|
||||||
.cmd_per_lun = CSIO_MAX_CMD_PER_LUN,
|
.cmd_per_lun = CSIO_MAX_CMD_PER_LUN,
|
||||||
.shost_attrs = csio_fcoe_vport_attrs,
|
.shost_groups = csio_fcoe_vport_groups,
|
||||||
.max_sectors = CSIO_MAX_SECTOR_SIZE,
|
.max_sectors = CSIO_MAX_SECTOR_SIZE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user