driver model: PM type conversions in drivers/pcmcia
Subsystems (2)
PATCH 1/1 driver model: PM type conversions in drivers/pcmcia
This fixes PM driver model type checking for drivers/pcmcia. Acked by Pavel Machek.
Signed-off-by Daniel Drake <[email protected]>
drivers/pcmcia/au1000_generic.c +1 -1
@@ -521,7 +521,7 @@ static int au1x00_drv_pcmcia_probe(struc } -static int au1x00_drv_pcmcia_suspend (struct device *dev,u32 state,u32 level) +static int au1x00_drv_pcmcia_suspend (struct device *dev,pm_message_t state,u32 level) {int ret =0 ;if (level ==SUSPEND_SAVE_STATE )
drivers/pcmcia/hd64465_ss.c +1 -1
@@ -860,7 +860,7 @@ static void hs_exit_socket(hs_socket_t *local_irq_restore (flags); } -static int hd64465_suspend (struct device *dev,u32 state,u32 level) +static int hd64465_suspend (struct device *dev,pm_message_t state,u32 level) {int ret =0 ;if (level ==SUSPEND_SAVE_STATE )
drivers/pcmcia/m32r_cfc.c +1 -1
@@ -749,7 +749,7 @@ static struct pccard_operations pcc_oper/*====================================================================*/ -static int m32r_pcc_suspend (struct device *dev,u32 state,u32 level) +static int m32r_pcc_suspend (struct device *dev,pm_message_t state,u32 level) {int ret =0 ;if (level ==SUSPEND_SAVE_STATE )
drivers/pcmcia/m32r_pcc.c +1 -1
@@ -701,7 +701,7 @@ static struct pccard_operations pcc_oper/*====================================================================*/ -static int m32r_pcc_suspend (struct device *dev,u32 state,u32 level) +static int m32r_pcc_suspend (struct device *dev,pm_message_t state,u32 level) {int ret =0 ;if (level ==SUSPEND_SAVE_STATE )
drivers/pcmcia/pxa2xx_base.c +1 -1
@@ -205,7 +205,7 @@ int pxa2xx_drv_pcmcia_probe(struct devic }EXPORT_SYMBOL (pxa2xx_drv_pcmcia_probe); -static int pxa2xx_drv_pcmcia_suspend (struct device *dev,u32 state,u32 level) +static int pxa2xx_drv_pcmcia_suspend (struct device *dev,pm_message_t state,u32 level) {int ret =0 ;if (level ==SUSPEND_SAVE_STATE )
drivers/pcmcia/sa1100_generic.c +1 -1
@@ -75,7 +75,7 @@ static int sa11x0_drv_pcmcia_probe(strucreturn ret; } -static int sa11x0_drv_pcmcia_suspend (struct device *dev,u32 state,u32 level) +static int sa11x0_drv_pcmcia_suspend (struct device *dev,pm_message_t state,u32 level) {int ret =0 ;if (level ==SUSPEND_SAVE_STATE )
drivers/pcmcia/sa1111_generic.c +1 -1
@@ -158,7 +158,7 @@ static int __devexit pcmcia_remove(strucreturn 0 ; } -static int pcmcia_suspend (struct sa1111_dev *dev,u32 state) +static int pcmcia_suspend (struct sa1111_dev *dev,pm_message_t state) {return pcmcia_socket_dev_suspend (&dev->dev, state); }
drivers/pcmcia/yenta_socket.c +2 -2
@@ -873,7 +873,7 @@ static void yenta_config_init(struct yenu16 bridge;struct pci_dev *dev = socket->dev; -pci_set_power_state (socket->dev,0 ); +pci_set_power_state (socket->dev,PCI_D0 );config_writel (socket,CB_LEGACY_MODE_BASE ,0 );config_writel (socket,PCI_BASE_ADDRESS_0 , dev->resource[0 ].start);
@@ -1052,7 +1052,7 @@ static int yenta_dev_resume (struct pci_struct yenta_socket *socket =pci_get_drvdata (dev);if (socket) { -pci_set_power_state (dev,0 ); +pci_set_power_state (dev,PCI_D0 );/* FIXME: pci_restore_state needs to have a better interface */ pci_restore_state (dev);pci_write_config_dword (dev,16 *4 , socket->saved_state[0 ]);