Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Paul Mackerras <paulus@au.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

authored by

Alan Stern and committed by
James Bottomley
19c4158b 13a17fde

+2 -6
+2 -6
drivers/scsi/mesh.c
··· 1765 1765 default: 1766 1766 return 0; 1767 1767 } 1768 - if (mesg.event == mdev->ofdev.dev.power.power_state.event) 1768 + if (ms->phase == sleeping) 1769 1769 return 0; 1770 1770 1771 1771 scsi_block_requests(ms->host); ··· 1780 1780 disable_irq(ms->meshintr); 1781 1781 set_mesh_power(ms, 0); 1782 1782 1783 - mdev->ofdev.dev.power.power_state = mesg; 1784 - 1785 1783 return 0; 1786 1784 } 1787 1785 ··· 1788 1790 struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); 1789 1791 unsigned long flags; 1790 1792 1791 - if (mdev->ofdev.dev.power.power_state.event == PM_EVENT_ON) 1793 + if (ms->phase != sleeping) 1792 1794 return 0; 1793 1795 1794 1796 set_mesh_power(ms, 1); ··· 1798 1800 spin_unlock_irqrestore(ms->host->host_lock, flags); 1799 1801 enable_irq(ms->meshintr); 1800 1802 scsi_unblock_requests(ms->host); 1801 - 1802 - mdev->ofdev.dev.power.power_state.event = PM_EVENT_ON; 1803 1803 1804 1804 return 0; 1805 1805 }