diff options
author | Pavel Machek <pavel@suse.cz> | 2005-03-29 17:43:58 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-29 17:43:58 -0800 |
commit | 0ece1b5c556b168f86cffc583125e19185e03d46 (patch) | |
tree | a9194ae76808636d9e7aa27e0f73740d8562cc5c | |
parent | 6cf672adaeb9d9bcae53e6c1658dcc4a1f732ead (diff) | |
download | history-0ece1b5c556b168f86cffc583125e19185e03d46.tar.gz |
[PATCH] Fix u32 vs. pm_message_t confusion in OSS
This fixes (part of) u32 vs. pm_message_t confusion in OSS.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | sound/oss/ali5455.c | 2 | ||||
-rw-r--r-- | sound/oss/cs4281/cs4281_wrapper-24.c | 2 | ||||
-rw-r--r-- | sound/oss/cs46xx.c | 4 | ||||
-rw-r--r-- | sound/oss/cs46xxpm-24.h | 2 | ||||
-rw-r--r-- | sound/oss/esssolo1.c | 2 | ||||
-rw-r--r-- | sound/oss/i810_audio.c | 2 | ||||
-rw-r--r-- | sound/oss/maestro3.c | 6 | ||||
-rw-r--r-- | sound/oss/trident.c | 4 | ||||
-rw-r--r-- | sound/oss/ymfpci.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/sound/oss/ali5455.c b/sound/oss/ali5455.c index a48be23dabfc1..9c9e6c0410f26 100644 --- a/sound/oss/ali5455.c +++ b/sound/oss/ali5455.c @@ -3528,7 +3528,7 @@ static void __devexit ali_remove(struct pci_dev *pci_dev) } #ifdef CONFIG_PM -static int ali_pm_suspend(struct pci_dev *dev, u32 pm_state) +static int ali_pm_suspend(struct pci_dev *dev, pm_message_t pm_state) { struct ali_card *card = pci_get_drvdata(dev); struct ali_state *state; diff --git a/sound/oss/cs4281/cs4281_wrapper-24.c b/sound/oss/cs4281/cs4281_wrapper-24.c index bd61a45983dd1..4559f02c99694 100644 --- a/sound/oss/cs4281/cs4281_wrapper-24.c +++ b/sound/oss/cs4281/cs4281_wrapper-24.c @@ -27,7 +27,7 @@ #include <linux/spinlock.h> static int cs4281_resume_null(struct pci_dev *pcidev) { return 0; } -static int cs4281_suspend_null(struct pci_dev *pcidev, u32 state) { return 0; } +static int cs4281_suspend_null(struct pci_dev *pcidev, pm_message_t state) { return 0; } #define free_dmabuf(state, dmabuf) \ pci_free_consistent(state->pcidev, \ diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c index bc4941cb8b11f..8ce6b48f1881b 100644 --- a/sound/oss/cs46xx.c +++ b/sound/oss/cs46xx.c @@ -388,7 +388,7 @@ static int cs_hardware_init(struct cs_card *card); static int cs46xx_powerup(struct cs_card *card, unsigned int type); static int cs461x_powerdown(struct cs_card *card, unsigned int type, int suspendflag); static void cs461x_clear_serial_FIFOs(struct cs_card *card, int type); -static int cs46xx_suspend_tbl(struct pci_dev *pcidev, u32 state); +static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state); static int cs46xx_resume_tbl(struct pci_dev *pcidev); #ifndef CS46XX_ACPI_SUPPORT @@ -5774,7 +5774,7 @@ static int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data) #endif #if CS46XX_ACPI_SUPPORT -static int cs46xx_suspend_tbl(struct pci_dev *pcidev, u32 state) +static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state) { struct cs_card *s = PCI_GET_DRIVER_DATA(pcidev); CS_DBGOUT(CS_PM | CS_FUNCTION, 2, diff --git a/sound/oss/cs46xxpm-24.h b/sound/oss/cs46xxpm-24.h index 7402cb76e43a8..e220bd7240f14 100644 --- a/sound/oss/cs46xxpm-24.h +++ b/sound/oss/cs46xxpm-24.h @@ -36,7 +36,7 @@ * for now (12/22/00) only enable the pm_register PM support. * allow these table entries to be null. */ -static int cs46xx_suspend_tbl(struct pci_dev *pcidev, u32 state); +static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state); static int cs46xx_resume_tbl(struct pci_dev *pcidev); #define cs_pm_register(a, b, c) NULL #define cs_pm_unregister_all(a) diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c index c5b130ae74d1d..6b3b9a99579db 100644 --- a/sound/oss/esssolo1.c +++ b/sound/oss/esssolo1.c @@ -2257,7 +2257,7 @@ static int setup_solo1(struct solo1_state *s) } static int -solo1_suspend(struct pci_dev *pci_dev, u32 state) { +solo1_suspend(struct pci_dev *pci_dev, pm_message_t state) { struct solo1_state *s = (struct solo1_state*)pci_get_drvdata(pci_dev); if (!s) return 1; diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c index a4b959ae9bbf5..7e9f667cf7a71 100644 --- a/sound/oss/i810_audio.c +++ b/sound/oss/i810_audio.c @@ -3470,7 +3470,7 @@ static void __devexit i810_remove(struct pci_dev *pci_dev) } #ifdef CONFIG_PM -static int i810_pm_suspend(struct pci_dev *dev, u32 pm_state) +static int i810_pm_suspend(struct pci_dev *dev, pm_message_t pm_state) { struct i810_card *card = pci_get_drvdata(dev); struct i810_state *state; diff --git a/sound/oss/maestro3.c b/sound/oss/maestro3.c index 17d4f0792d382..f3dec70fcb9b2 100644 --- a/sound/oss/maestro3.c +++ b/sound/oss/maestro3.c @@ -375,7 +375,7 @@ static struct m3_card *devs; * I'm not very good at laying out functions in a file :) */ static int m3_notifier(struct notifier_block *nb, unsigned long event, void *buf); -static int m3_suspend(struct pci_dev *pci_dev, u32 state); +static int m3_suspend(struct pci_dev *pci_dev, pm_message_t state); static void check_suspend(struct m3_card *card); static struct notifier_block m3_reboot_nb = { @@ -2777,12 +2777,12 @@ static int m3_notifier(struct notifier_block *nb, unsigned long event, void *buf for(card = devs; card != NULL; card = card->next) { if(!card->in_suspend) - m3_suspend(card->pcidev, 3); /* XXX legal? */ + m3_suspend(card->pcidev, PMSG_SUSPEND); /* XXX legal? */ } return 0; } -static int m3_suspend(struct pci_dev *pci_dev, u32 state) +static int m3_suspend(struct pci_dev *pci_dev, pm_message_t state) { unsigned long flags; int i; diff --git a/sound/oss/trident.c b/sound/oss/trident.c index ddf39ed3ff629..47537f0a5b058 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c @@ -487,7 +487,7 @@ static struct trident_channel *ali_alloc_rec_pcm_channel(struct trident_card *ca static struct trident_channel *ali_alloc_pcm_channel(struct trident_card *card); static void ali_restore_regs(struct trident_card *card); static void ali_save_regs(struct trident_card *card); -static int trident_suspend(struct pci_dev *dev, u32 unused); +static int trident_suspend(struct pci_dev *dev, pm_message_t unused); static int trident_resume(struct pci_dev *dev); static void ali_free_pcm_channel(struct trident_card *card, unsigned int channel); static int ali_setup_multi_channels(struct trident_card *card, int chan_nums); @@ -3723,7 +3723,7 @@ ali_restore_regs(struct trident_card *card) } static int -trident_suspend(struct pci_dev *dev, u32 unused) +trident_suspend(struct pci_dev *dev, pm_message_t unused) { struct trident_card *card = pci_get_drvdata(dev); diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c index 3bbe819ed3f72..05203ad523f7a 100644 --- a/sound/oss/ymfpci.c +++ b/sound/oss/ymfpci.c @@ -2074,7 +2074,7 @@ static /*const*/ struct file_operations ymf_mixer_fops = { /* */ -static int ymf_suspend(struct pci_dev *pcidev, u32 unused) +static int ymf_suspend(struct pci_dev *pcidev, pm_message_t unused) { struct ymf_unit *unit = pci_get_drvdata(pcidev); unsigned long flags; |