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

Commit 2a569579 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] pm: more u32 vs. pm_message_t fixes 



Few more u32 vs. pm_message_t fixes.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e8af300c

drivers/message/fusion/mptbase.c

+1 −13
Original line number Diff line number Diff line
@@ -1363,19 +1363,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state) 
	u32 device_state;

	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);



	switch(state)

	{

		case 1: /* S1 */

			device_state=1; /* D1 */;

			break;

		case 3: /* S3 */

		case 4: /* S4 */

			device_state=3; /* D3 */;

			break;

		default:

			return -EAGAIN /*FIXME*/;

			break;

	}

	device_state=pci_choose_state(pdev, state);



	printk(MYIOC_s_INFO_FMT

	"pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n",

drivers/message/fusion/mptscsih.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
extern void mptscsih_remove(struct pci_dev *);

extern void mptscsih_shutdown(struct pci_dev *);

#ifdef CONFIG_PM

extern int mptscsih_suspend(struct pci_dev *pdev, u32 state);

extern int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);

extern int mptscsih_resume(struct pci_dev *pdev);

#endif

extern int mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset, int length, int func);

drivers/net/skge.c

+2 −2
Original line number Diff line number Diff line
@@ -3259,7 +3259,7 @@ static void __devexit skge_remove(struct pci_dev *pdev) 
}



#ifdef CONFIG_PM

static int skge_suspend(struct pci_dev *pdev, u32 state)

static int skge_suspend(struct pci_dev *pdev, pm_message_t state)

{

	struct skge_hw *hw  = pci_get_drvdata(pdev);

	int i, wol = 0;
@@ -3279,7 +3279,7 @@ static int skge_suspend(struct pci_dev *pdev, u32 state) 
	}



	pci_save_state(pdev);

	pci_enable_wake(pdev, state, wol);

	pci_enable_wake(pdev, pci_choose_state(pdev, state), wol);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));

drivers/net/typhoon.c

+3 −3
Original line number Diff line number Diff line
@@ -1906,9 +1906,9 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, u16 events) 
	 */

	netif_carrier_off(tp->dev);



	pci_enable_wake(tp->pdev, pci_choose_state(pdev, state), 1);

	pci_enable_wake(tp->pdev, state, 1);

	pci_disable_device(pdev);

	return pci_set_power_state(pdev, pci_choose_state(pdev, state));

	return pci_set_power_state(pdev, state);

}



static int
@@ -2274,7 +2274,7 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state) 
		goto need_resume;

	}



	if(typhoon_sleep(tp, state, tp->wol_events) < 0) {

	if(typhoon_sleep(tp, pci_choose_state(pdev, state), tp->wol_events) < 0) {

		printk(KERN_ERR "%s: unable to put card to sleep\n", dev->name);

		goto need_resume;

	}

drivers/pci/pcie/portdrv_core.c

+3 −3
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ int pcie_port_device_register(struct pci_dev *dev) 
static int suspend_iter(struct device *dev, void *data)

{

	struct pcie_port_service_driver *service_driver;

	u32 state = (u32)data;

	pm_message_t state = * (pm_message_t *) data;



 	if ((dev->bus == &pcie_port_bus_type) &&

 	    (dev->driver)) {
@@ -336,9 +336,9 @@ static int suspend_iter(struct device *dev, void *data) 
	return 0;

}



int pcie_port_device_suspend(struct pci_dev *dev, u32 state)

int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state)

{

	device_for_each_child(&dev->dev, (void *)state, suspend_iter);

	device_for_each_child(&dev->dev, &state, suspend_iter);

	return 0;

}