PATCH: another C99 and version casd

Alan Cox (alan@lxorguk.ukuu.org.uk)
Tue, 8 Apr 2003 01:41:12 +0100


diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/sound/oss/i810_audio.c linux-2.5.67-ac1/sound/oss/i810_audio.c
--- linux-2.5.67/sound/oss/i810_audio.c 2003-03-26 20:00:02.000000000 +0000
+++ linux-2.5.67-ac1/sound/oss/i810_audio.c 2003-04-03 23:52:57.000000000 +0100
@@ -79,7 +79,6 @@
*/

#include <linux/module.h>
-#include <linux/version.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/ioport.h>
@@ -2554,15 +2553,15 @@
}

static /*const*/ struct file_operations i810_audio_fops = {
- owner: THIS_MODULE,
- llseek: no_llseek,
- read: i810_read,
- write: i810_write,
- poll: i810_poll,
- ioctl: i810_ioctl,
- mmap: i810_mmap,
- open: i810_open,
- release: i810_release,
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .read = i810_read,
+ .write = i810_write,
+ .poll = i810_poll,
+ .ioctl = i810_ioctl,
+ .mmap = i810_mmap,
+ .open = i810_open,
+ .release = i810_release,
};

/* Write AC97 codec registers */
@@ -2690,10 +2689,10 @@
}

static /*const*/ struct file_operations i810_mixer_fops = {
- owner: THIS_MODULE,
- llseek: no_llseek,
- ioctl: i810_ioctl_mixdev,
- open: i810_open_mixdev,
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .ioctl = i810_ioctl_mixdev,
+ .open = i810_open_mixdev,
};

/* AC97 codec initialisation. These small functions exist so we don't
@@ -3430,13 +3429,13 @@
#define I810_MODULE_NAME "intel810_audio"

static struct pci_driver i810_pci_driver = {
- name: I810_MODULE_NAME,
- id_table: i810_pci_tbl,
- probe: i810_probe,
- remove: __devexit_p(i810_remove),
+ .name = I810_MODULE_NAME,
+ .id_table = i810_pci_tbl,
+ .probe = i810_probe,
+ .remove = __devexit_p(i810_remove),
#ifdef CONFIG_PM
- suspend: i810_pm_suspend,
- resume: i810_pm_resume,
+ .suspend = i810_pm_suspend,
+ .resume = i810_pm_resume,
#endif /* CONFIG_PM */
};

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/