From: Brian King Date: Mon, 28 Apr 2008 22:36:20 +0000 (-0500) Subject: [SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions X-Git-Tag: v2.6.26-rc1~9^2~17 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=49dd09613cf8ae3b697c341c501b7526b462cfeb;p=linux-2.6-omap-h63xx.git [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: Brian King Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index de5ae6a6502..999e91ea745 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -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,