X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sound%2Foss%2Fforte.c;h=8406bc90c4ff7618e5b85240cf90a15ae2c0f1fc;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=67b2bbb2aa101f0c5867e75cd272b58479e3152d;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/sound/oss/forte.c b/sound/oss/forte.c
index 67b2bbb2a..8406bc90c 100644
--- a/sound/oss/forte.c
+++ b/sound/oss/forte.c
@@ -238,7 +238,7 @@ forte_ac97_wait (struct forte_chip *chip)
  * @reg:	register to read
  */
 
-u16
+static u16
 forte_ac97_read (struct ac97_codec *codec, u8 reg)
 {
 	u16 ret = 0;
@@ -283,7 +283,7 @@ forte_ac97_read (struct ac97_codec *codec, u8 reg)
  * @val:	value to write
  */
 
-void
+static void
 forte_ac97_write (struct ac97_codec *codec, u8 reg, u16 val)
 {
 	struct forte_chip *chip = codec->private_data;
@@ -1409,7 +1409,8 @@ forte_dsp_mmap (struct file *file, struct vm_area_struct *vma)
                 goto out;
 	}
 
-        if (remap_page_range (vma, vma->vm_start, virt_to_phys (channel->buf),
+        if (remap_pfn_range(vma, vma->vm_start,
+			      virt_to_phys(channel->buf) >> PAGE_SHIFT,
 			      size, vma->vm_page_prot)) {
 		DPRINTK ("%s: remap el a no worko\n", __FUNCTION__);
 		ret = -EAGAIN;
@@ -2111,12 +2112,7 @@ forte_init_module (void)
 {
 	printk (KERN_INFO PFX DRIVER_VERSION "\n");
 
-	if (!pci_register_driver (&forte_pci_driver)) {
-		pci_unregister_driver (&forte_pci_driver);
-		return -ENODEV;
-	}
-
-	return 0;
+	return pci_register_driver (&forte_pci_driver);
 }