Commit 19c4158b authored by Alan Stern's avatar Alan Stern Committed by James Bottomley

[SCSI] SCSI: remove dev->power.power_state from mesh driver

power.power_state is scheduled for removal.  This patch (as1055)
removes all uses of that field from the SCSI mesh driver.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarPaul Mackerras <paulus@au.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 13a17fde
...@@ -1765,7 +1765,7 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t mesg) ...@@ -1765,7 +1765,7 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t mesg)
default: default:
return 0; return 0;
} }
if (mesg.event == mdev->ofdev.dev.power.power_state.event) if (ms->phase == sleeping)
return 0; return 0;
scsi_block_requests(ms->host); scsi_block_requests(ms->host);
...@@ -1780,8 +1780,6 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t mesg) ...@@ -1780,8 +1780,6 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t mesg)
disable_irq(ms->meshintr); disable_irq(ms->meshintr);
set_mesh_power(ms, 0); set_mesh_power(ms, 0);
mdev->ofdev.dev.power.power_state = mesg;
return 0; return 0;
} }
...@@ -1790,7 +1788,7 @@ static int mesh_resume(struct macio_dev *mdev) ...@@ -1790,7 +1788,7 @@ static int mesh_resume(struct macio_dev *mdev)
struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
unsigned long flags; unsigned long flags;
if (mdev->ofdev.dev.power.power_state.event == PM_EVENT_ON) if (ms->phase != sleeping)
return 0; return 0;
set_mesh_power(ms, 1); set_mesh_power(ms, 1);
...@@ -1801,8 +1799,6 @@ static int mesh_resume(struct macio_dev *mdev) ...@@ -1801,8 +1799,6 @@ static int mesh_resume(struct macio_dev *mdev)
enable_irq(ms->meshintr); enable_irq(ms->meshintr);
scsi_unblock_requests(ms->host); scsi_unblock_requests(ms->host);
mdev->ofdev.dev.power.power_state.event = PM_EVENT_ON;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment