Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f84f226 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] zfcp: fix compilation due to rports changes 



struct zfcp_port::scsi_id was removed by commit
  3859f6a2

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3d52acb3

drivers/s390/scsi/zfcp_sysfs_port.c

+0 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_port_##_name##_show, NULL); 
ZFCP_DEFINE_PORT_ATTR(status, "0x%08x\n", atomic_read(&port->status));

ZFCP_DEFINE_PORT_ATTR(wwnn, "0x%016llx\n", port->wwnn);

ZFCP_DEFINE_PORT_ATTR(d_id, "0x%06x\n", port->d_id);

ZFCP_DEFINE_PORT_ATTR(scsi_id, "0x%x\n", port->scsi_id);

ZFCP_DEFINE_PORT_ATTR(in_recovery, "%d\n", atomic_test_mask

		      (ZFCP_STATUS_COMMON_ERP_INUSE, &port->status));

ZFCP_DEFINE_PORT_ATTR(access_denied, "%d\n", atomic_test_mask
@@ -263,7 +262,6 @@ static struct attribute_group zfcp_port_common_attr_group = { 
static struct attribute *zfcp_port_no_ns_attrs[] = {

	&dev_attr_unit_add.attr,

	&dev_attr_unit_remove.attr,

	&dev_attr_scsi_id.attr,

	NULL

};