Hi!
This fixes u32 vs. pm_message_t in OSS. [I tried to go through alsa
developers, but Takashi told me they do not have control over
sound/oss.] No real code changes, please apply,
Pavel
(all bugs are mine :-).
From: Bernard Blackham <bernard@xxxxxxxxxxxxxxx>
Signed-off-by: Pavel Machek <pavel@xxxxxxx>
--- clean/sound/oss/ali5455.c 2005-01-22 02:48:45.000000000 +0100
+++ linux/sound/oss/ali5455.c 2005-01-28 19:18:10.000000000 +0100
@@ -3528,7 +3528,7 @@
}
#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;
--- clean/sound/oss/cs4281/cs4281_wrapper-24.c 2005-01-22 02:47:48.000000000 +0100
+++ linux/sound/oss/cs4281/cs4281_wrapper-24.c 2005-01-28 19:18:10.000000000 +0100
@@ -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, \
--- clean/sound/oss/cs46xx.c 2005-01-22 02:49:21.000000000 +0100
+++ linux/sound/oss/cs46xx.c 2005-01-28 19:18:10.000000000 +0100
@@ -388,7 +388,7 @@
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 @@
#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,
--- clean/sound/oss/cs46xxpm-24.h 2005-01-22 02:48:58.000000000 +0100
+++ linux/sound/oss/cs46xxpm-24.h 2005-01-28 19:18:10.000000000 +0100
@@ -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)
--- clean/sound/oss/esssolo1.c 2005-01-22 02:47:15.000000000 +0100
+++ linux/sound/oss/esssolo1.c 2005-01-28 19:18:10.000000000 +0100
@@ -2257,7 +2257,7 @@
}
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;
--- clean/sound/oss/i810_audio.c 2005-01-22 02:48:35.000000000 +0100
+++ linux/sound/oss/i810_audio.c 2005-01-28 19:18:10.000000000 +0100
@@ -3457,7 +3457,7 @@
}
#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;
--- clean/sound/oss/maestro3.c 2005-01-22 02:48:48.000000000 +0100
+++ linux/sound/oss/maestro3.c 2005-01-28 19:18:10.000000000 +0100
@@ -375,7 +375,7 @@
* 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 @@
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;
--- clean/sound/oss/trident.c 2005-01-22 02:48:35.000000000 +0100
+++ linux/sound/oss/trident.c 2005-01-28 19:18:10.000000000 +0100
@@ -487,7 +487,7 @@
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 @@
}
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);
--- clean/sound/oss/ymfpci.c 2005-01-22 02:48:27.000000000 +0100
+++ linux/sound/oss/ymfpci.c 2005-01-28 19:18:10.000000000 +0100
@@ -2074,7 +2074,7 @@
/*
*/
-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;
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
