Here is the vm_pgoff patch, merged with a message cleanup patch I had
lying around.
--------------15436A1FBC10EE22C0ED8C06
Content-Type: text/plain; charset=us-ascii;
name="es1371-2.3.25-pre2.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="es1371-2.3.25-pre2.patch"
Index: drivers/sound/es1371.c
===================================================================
RCS file: /g/cvslan/linux_2_3/drivers/sound/es1371.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 es1371.c
--- drivers/sound/es1371.c 1999/10/29 01:16:58 1.1.1.2
+++ drivers/sound/es1371.c 1999/10/31 00:50:02
@@ -370,6 +370,10 @@
#define SND_DEV_DSP16 5
+#undef MODULE_NAME
+#define MODULE_NAME "es1371"
+#define PFX MODULE_NAME ": "
+
/* --------------------------------------------------------------------- */
static const char *stereo_enhancement[] __initdata =
@@ -526,7 +530,7 @@
return r;
udelay(1);
}
- printk(KERN_DEBUG "es1371: sample rate converter timeout r = 0x%08x\n", r);
+ printk(KERN_DEBUG PFX "sample rate converter timeout r = 0x%08x\n", r);
return r;
}
@@ -1141,7 +1145,7 @@
/* --------------------------------------------------------------------- */
-static const char invalid_magic[] = KERN_CRIT "es1371: invalid magic value\n";
+static const char invalid_magic[] = KERN_CRIT PFX "invalid magic value\n";
#define VALIDATE_STATE(s) \
({ \
@@ -1663,7 +1667,7 @@
tmo = 3 * HZ * (count + s->dma_dac1.fragsize) / 2 / s->dac1rate;
tmo >>= sample_shift[(s->sctrl & SCTRL_P1FMT) >> SCTRL_SH_P1FMT];
if (!schedule_timeout(tmo + 1))
- DBG(printk(KERN_DEBUG "es1371: dac1 dma timed out??\n");)
+ DBG(printk(KERN_DEBUG PFX "dac1 dma timed out??\n");)
}
remove_wait_queue(&s->dma_dac1.wait, &wait);
set_current_state(TASK_RUNNING);
@@ -1698,7 +1702,7 @@
tmo = 3 * HZ * (count + s->dma_dac2.fragsize) / 2 / s->dac2rate;
tmo >>= sample_shift[(s->sctrl & SCTRL_P2FMT) >> SCTRL_SH_P2FMT];
if (!schedule_timeout(tmo + 1))
- DBG(printk(KERN_DEBUG "es1371: dac2 dma timed out??\n");)
+ DBG(printk(KERN_DEBUG PFX "dac2 dma timed out??\n");)
}
remove_wait_queue(&s->dma_dac2.wait, &wait);
set_current_state(TASK_RUNNING);
@@ -1894,7 +1898,7 @@
db = &s->dma_adc;
} else
return -EINVAL;
- if (vma->vm_offset != 0)
+ if (vma->vm_pgoff != 0)
return -EINVAL;
size = vma->vm_end - vma->vm_start;
if (size > (PAGE_SIZE << db->buforder))
@@ -2415,7 +2419,7 @@
return -EINVAL;
if ((ret = prog_dmabuf_dac1(s)) != 0)
return ret;
- if (vma->vm_offset != 0)
+ if (vma->vm_pgoff != 0)
return -EINVAL;
size = vma->vm_end - vma->vm_start;
if (size > (PAGE_SIZE << s->dma_dac1.buforder))
@@ -2928,7 +2932,7 @@
}
tmo = (count * HZ) / 3100;
if (!schedule_timeout(tmo ? : 1) && tmo)
- printk(KERN_DEBUG "es1371: midi timed out??\n");
+ printk(KERN_DEBUG PFX "midi timed out??\n");
}
remove_wait_queue(&s->midi.owait, &wait);
set_current_state(TASK_RUNNING);
@@ -3059,7 +3063,7 @@
if (pcidev->irq == 0)
return -1;
if (!(s = kmalloc(sizeof(struct es1371_state), GFP_KERNEL))) {
- printk(KERN_WARNING "es1371: out of memory\n");
+ printk(KERN_WARNING PFX "out of memory\n");
return -1;
}
memset(s, 0, sizeof(struct es1371_state));
@@ -3077,19 +3081,19 @@
s->vendor = pcidev->vendor;
s->device = pcidev->device;
pci_read_config_byte(pcidev, PCI_REVISION_ID, &s->rev);
- printk(KERN_INFO "es1371: found chip, vendor id 0x%04x device id 0x%04x revision 0x%02x\n",
+ printk(KERN_INFO PFX "found chip, vendor id 0x%04x device id 0x%04x revision 0x%02x\n",
s->vendor, s->device, s->rev);
if (check_region(s->io, ES1371_EXTENT)) {
- printk(KERN_ERR "es1371: io ports %#lx-%#lx in use\n", s->io, s->io+ES1371_EXTENT-1);
+ printk(KERN_ERR PFX "io ports %#lx-%#lx in use\n", s->io, s->io+ES1371_EXTENT-1);
goto err_region;
}
- request_region(s->io, ES1371_EXTENT, "es1371");
- if (request_irq(s->irq, es1371_interrupt, SA_SHIRQ, "es1371", s)) {
- printk(KERN_ERR "es1371: irq %u in use\n", s->irq);
+ request_region(s->io, ES1371_EXTENT, MODULE_NAME);
+ if (request_irq(s->irq, es1371_interrupt, SA_SHIRQ, MODULE_NAME, s)) {
+ printk(KERN_ERR PFX "irq %u in use\n", s->irq);
goto err_irq;
}
- printk(KERN_INFO "es1371: found es1371 rev %d at io %#lx irq %u\n"
- KERN_INFO "es1371: features: joystick 0x%x\n", s->rev, s->io, s->irq, joystick[index]);
+ printk(KERN_INFO PFX "found es1371 rev %d at io %#lx irq %u\n"
+ KERN_INFO PFX "features: joystick 0x%x\n", s->rev, s->io, s->irq, joystick[index]);
/* register devices */
if ((s->dev_audio = register_sound_dsp(&es1371_audio_fops, -1)) < 0)
goto err_dev1;
@@ -3101,7 +3105,7 @@
goto err_dev4;
#ifdef ES1371_DEBUG
/* intialize the debug proc device */
- s->ps = create_proc_entry("es1371", S_IFREG | S_IRUGO, NULL);
+ s->ps = create_proc_entry(MODULE_NAME, S_IFREG | S_IRUGO, NULL);
if (s->ps)
s->ps->read_proc = proc_es1371_dump;
#endif /* ES1371_DEBUG */
@@ -3110,7 +3114,7 @@
s->ctrl = 0;
if ((joystick[index] & ~0x18) == 0x200) {
if (check_region(joystick[index], JOY_EXTENT))
- printk(KERN_ERR "es1371: joystick address 0x%x already in use\n", joystick[index]);
+ printk(KERN_ERR PFX "joystick address 0x%x already in use\n", joystick[index]);
else {
s->ctrl |= CTRL_JYSTK_EN | (((joystick[index] >> 3) & CTRL_JOY_MASK) << CTRL_JOY_SHIFT);
}
@@ -3120,11 +3124,11 @@
/* check to see if s/pdif mode is being requested */
if (spdif[index]) {
if (s->rev >= 4) {
- printk(KERN_INFO "es1371: enabling S/PDIF output\n");
+ printk(KERN_INFO PFX "enabling S/PDIF output\n");
cssr |= STAT_EN_SPDIF;
s->ctrl |= CTRL_SPDIFEN_B;
} else {
- printk(KERN_ERR "es1371: revision %d does not support S/PDIF\n", s->rev);
+ printk(KERN_ERR PFX "revision %d does not support S/PDIF\n", s->rev);
}
}
/* initialize the chips */
@@ -3169,9 +3173,9 @@
id[1] = ' ';
if (id[2] <= ' ' || id[2] > 0x7f)
id[2] = ' ';
- printk(KERN_INFO "es1371: codec vendor %s (0x%04x%02x) revision %d (0x%02x)\n",
+ printk(KERN_INFO PFX "codec vendor %s (0x%04x%02x) revision %d (0x%02x)\n",
id, val & 0xffff, (val2 >> 8) & 0xff, val2 & 0xff, val2 & 0xff);
- printk(KERN_INFO "es1371: codec features");
+ printk(KERN_INFO PFX "codec features");
if (s->mix.codec_id & CODEC_ID_DEDICATEDMIC)
printk(" dedicated MIC PCM in");
if (s->mix.codec_id & CODEC_ID_MODEMCODEC)
@@ -3194,7 +3198,7 @@
printk(" 20bit ADC");
printk("%s\n", (s->mix.codec_id & 0x3ff) ? "" : " none");
val = (s->mix.codec_id >> CODEC_ID_SESHIFT) & CODEC_ID_SEMASK;
- printk(KERN_INFO "es1371: stereo enhancement: %s\n",
+ printk(KERN_INFO PFX "stereo enhancement: %s\n",
(val <= 26 && stereo_enhancement[val]) ? stereo_enhancement[val] : "unknown");
fs = get_fs();
@@ -3220,7 +3224,7 @@
err_dev2:
unregister_sound_dsp(s->dev_audio);
err_dev1:
- printk(KERN_ERR "es1371: cannot register misc device\n");
+ printk(KERN_ERR PFX "cannot register misc device\n");
free_irq(s->irq, s);
err_irq:
release_region(s->io, ES1371_EXTENT);
@@ -3237,7 +3241,7 @@
if (!pci_present()) /* No PCI bus in this machine! */
return -ENODEV;
- printk(KERN_INFO "es1371: version v0.22 time " __TIME__ " " __DATE__ "\n");
+ printk(KERN_INFO PFX "version v0.22 time " __TIME__ " " __DATE__ "\n");
while (index < NR_DEVICE && (pcidev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pcidev))) {
if (pcidev->vendor == PCI_VENDOR_ID_ENSONIQ) {
if (pcidev->device != PCI_DEVICE_ID_ENSONIQ_ES1371 &&
@@ -3264,7 +3268,7 @@
devs = devs->next;
#ifdef ES1371_DEBUG
if (s->ps)
- remove_proc_entry("es1371", NULL);
+ remove_proc_entry(MODULE_NAME, NULL);
#endif /* ES1371_DEBUG */
outl(0, s->io+ES1371_REG_CONTROL); /* switch everything off */
outl(0, s->io+ES1371_REG_SERIAL_CONTROL); /* clear serial interrupts */
@@ -3277,7 +3281,7 @@
unregister_sound_midi(s->dev_midi);
kfree_s(s, sizeof(struct es1371_state));
}
- printk(KERN_INFO "es1371: unloading\n");
+ printk(KERN_INFO PFX "unloading\n");
}
module_init(init_es1371);
--------------15436A1FBC10EE22C0ED8C06--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/