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

Commit c8024eb5 authored by Andreas Herrmann's avatar Andreas Herrmann Committed by
Browse files

[SCSI] zfcp: get rid of physical_wwpn and physical_s_id 



Remove all remainders of obsolete zfcp adapter attributes physical_wwpn and
physical_s_id.

Signed-off-by: default avatarAndreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 3542adcb

drivers/s390/scsi/zfcp_def.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -915,8 +915,6 @@ struct zfcp_adapter { 
	wwn_t			peer_wwnn;	   /* P2P peer WWNN */

	wwn_t			peer_wwnn;	   /* P2P peer WWNN */

	wwn_t			peer_wwpn;	   /* P2P peer WWPN */

	wwn_t			peer_wwpn;	   /* P2P peer WWPN */

	u32			peer_d_id;	   /* P2P peer D_ID */

	u32			peer_d_id;	   /* P2P peer D_ID */

	wwn_t			physical_wwpn;     /* WWPN of physical port */

	u32			physical_s_id;     /* local FC port ID */

	struct ccw_device       *ccw_device;	   /* S/390 ccw device */

	struct ccw_device       *ccw_device;	   /* S/390 ccw device */

	u8			fc_service_class;

	u8			fc_service_class;

	u32			hydra_version;	   /* Hydra version */

	u32			hydra_version;	   /* Hydra version */

drivers/s390/scsi/zfcp_sysfs_adapter.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -55,8 +55,6 @@ ZFCP_DEFINE_ADAPTER_ATTR(status, "0x%08x\n", atomic_read(&adapter->status)); 
ZFCP_DEFINE_ADAPTER_ATTR(peer_wwnn, "0x%016llx\n", adapter->peer_wwnn);

ZFCP_DEFINE_ADAPTER_ATTR(peer_wwnn, "0x%016llx\n", adapter->peer_wwnn);

ZFCP_DEFINE_ADAPTER_ATTR(peer_wwpn, "0x%016llx\n", adapter->peer_wwpn);

ZFCP_DEFINE_ADAPTER_ATTR(peer_wwpn, "0x%016llx\n", adapter->peer_wwpn);

ZFCP_DEFINE_ADAPTER_ATTR(peer_d_id, "0x%06x\n", adapter->peer_d_id);

ZFCP_DEFINE_ADAPTER_ATTR(peer_d_id, "0x%06x\n", adapter->peer_d_id);

ZFCP_DEFINE_ADAPTER_ATTR(physical_wwpn, "0x%016llx\n", adapter->physical_wwpn);

ZFCP_DEFINE_ADAPTER_ATTR(physical_s_id, "0x%06x\n", adapter->physical_s_id);

ZFCP_DEFINE_ADAPTER_ATTR(card_version, "0x%04x\n", adapter->hydra_version);

ZFCP_DEFINE_ADAPTER_ATTR(card_version, "0x%04x\n", adapter->hydra_version);

ZFCP_DEFINE_ADAPTER_ATTR(lic_version, "0x%08x\n", adapter->fsf_lic_version);

ZFCP_DEFINE_ADAPTER_ATTR(lic_version, "0x%08x\n", adapter->fsf_lic_version);

ZFCP_DEFINE_ADAPTER_ATTR(hardware_version, "0x%08x\n",

ZFCP_DEFINE_ADAPTER_ATTR(hardware_version, "0x%08x\n",
@@ -241,8 +239,6 @@ static struct attribute *zfcp_adapter_attrs[] = { 
	&dev_attr_peer_wwnn.attr,

	&dev_attr_peer_wwnn.attr,

	&dev_attr_peer_wwpn.attr,

	&dev_attr_peer_wwpn.attr,

	&dev_attr_peer_d_id.attr,

	&dev_attr_peer_d_id.attr,

	&dev_attr_physical_wwpn.attr,

	&dev_attr_physical_s_id.attr,

	&dev_attr_card_version.attr,

	&dev_attr_card_version.attr,

	&dev_attr_lic_version.attr,

	&dev_attr_lic_version.attr,

	&dev_attr_status.attr,

	&dev_attr_status.attr,