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

Commit 49dd0961 authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions 



Due to recent device model changes it now no longer tolerates name
collisions.  This causes a problem for ipr whose "state" attribute
collides with an identically named one in the SCSI mid-layer. Rename
the ipr driver attribute to be more specific.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 69cd39e9

drivers/scsi/ipr.c

+1 −1
Original line number Diff line number Diff line
@@ -2791,7 +2791,7 @@ static ssize_t ipr_store_adapter_state(struct device *dev, 


static struct device_attribute ipr_ioa_state_attr = {

	.attr = {

		.name =		"state",

		.name =		"online_state",

		.mode =		S_IRUGO | S_IWUSR,

	},

	.show = ipr_show_adapter_state,