LinuxLists.cc - [PATCH] ov511-2.28 patch for 2.6.12 kernel compat.

2005-09-27 13:52:07

Subject: [PATCH] ov511-2.28 patch for 2.6.12 kernel compat.

diff -rbup ov511-2.28-orig/ov511_core.c ov511-2.28-new/ov511_core.c
--- ov511-2.28-orig/ov511_core.c 2004-07-13 13:54:22.000000000 +0200
+++ ov511-2.28-new/ov511_core.c 2005-09-24 13:59:04.000000000 +0200
@@ -3547,7 +3547,11 @@ ov51x_unlink_isoc(struct usb_ov511 *ov)
/* Unschedule all of the iso td's */
for (n = OV511_NUMSBUF - 1; n >= 0; n--) {
if (ov->sbuf[n].urb) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
+ usb_kill_urb(ov->sbuf[n].urb);
+#else
usb_unlink_urb(ov->sbuf[n].urb);
+#endif
usb_free_urb(ov->sbuf[n].urb);
ov->sbuf[n].urb = NULL;
}
@@ -4881,12 +4885,18 @@ ov51x_mmap(struct file *file, struct vm_

pos = (unsigned long)ov->fbuf;
while (size > 0) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+ page = vmalloc_to_pfn((void *)pos);
+ if (remap_pfn_range(vma, start, page, PAGE_SIZE,
+ PAGE_SHARED)) {
+#else
page = kvirt_to_pa(pos);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) || defined(RH9_REMAP)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) || defined(RH9_REMAP)
if (remap_page_range(vma, start, page, PAGE_SIZE,
PAGE_SHARED)) {
-#else
+# else
if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED)) {
+# endif
#endif
up(&ov->lock);
return -EAGAIN;
diff -rbup ov511-2.28-orig/ovcamchip_core.c ov511-2.28-new/ovcamchip_core.c
--- ov511-2.28-orig/ovcamchip_core.c 2004-07-16 12:58:25.000000000 +0200
+++ ov511-2.28-new/ovcamchip_core.c 2005-09-24 13:54:11.000000000 +0200
@@ -582,7 +582,9 @@ static struct i2c_driver driver = {

static struct i2c_client client_template = {
I2C_DEVNAME("(unset)"),
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
.id = -1,
+#endif
.driver = &driver,
};

diff -rbup ov511-2.28-orig/ovfx2.c ov511-2.28-new/ovfx2.c
--- ov511-2.28-orig/ovfx2.c 2004-07-16 01:32:08.000000000 +0200
+++ ov511-2.28-new/ovfx2.c 2005-09-24 14:00:12.000000000 +0200
@@ -1678,7 +1678,11 @@ ovfx2_unlink_bulk(struct usb_ovfx2 *ov)
/* Unschedule all of the bulk td's */
for (n = OVFX2_NUMSBUF - 1; n >= 0; n--) {
if (ov->sbuf[n].urb) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
usb_unlink_urb(ov->sbuf[n].urb);
+#else
+ usb_unlink_urb(ov->sbuf[n].urb);
+#endif
usb_free_urb(ov->sbuf[n].urb);
ov->sbuf[n].urb = NULL;
}
@@ -2502,12 +2506,18 @@ ovfx2_mmap(struct file *file, struct vm_

pos = (unsigned long)ov->fbuf;
while (size > 0) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+ page = vmalloc_to_pfn((void *)pos);
+ if (remap_pfn_range(vma, start, page, PAGE_SIZE,
+ PAGE_SHARED)) {
+#else
page = kvirt_to_pa(pos);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) || defined(RH9_REMAP)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 3) || defined(RH9_REMAP)
if (remap_page_range(vma, start, page, PAGE_SIZE,
PAGE_SHARED)) {
-#else
+# else
if (remap_page_range(start, page, PAGE_SIZE, PAGE_SHARED)) {
+# endif
#endif
up(&ov->lock);
return -EAGAIN;
diff -rbup ov511-2.28-orig/saa7111-new.c ov511-2.28-new/saa7111-new.c
--- ov511-2.28-orig/saa7111-new.c 2004-07-13 14:04:46.000000000 +0200
+++ ov511-2.28-new/saa7111-new.c 2005-09-24 13:54:56.000000000 +0200
@@ -520,7 +520,9 @@ static struct i2c_driver driver = {

static struct i2c_client client_template = {
I2C_DEVNAME("(unset)"),
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
.id = -1,
+#endif
.driver = &driver
};

diff -rbup ov511-2.28-orig/tda7313.c ov511-2.28-new/tda7313.c
--- ov511-2.28-orig/tda7313.c 2004-07-15 12:06:44.000000000 +0200
+++ ov511-2.28-new/tda7313.c 2005-09-24 13:56:13.000000000 +0200
@@ -202,7 +202,9 @@ static struct i2c_driver driver = {

static struct i2c_client client_template = {
I2C_DEVNAME("tda7313"),
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
.id = -1,
+#endif
.driver = &driver,
};

Attachments:

ov511-2.28_linux-2.6.12.patch (3.75 kB)

2005-09-27 17:23:18

by Gregor Jasny

[permalink] [raw]

Subject: Re: [PATCH] ov511-2.28 patch for 2.6.12 kernel compat.

Laurent Meunier schrieb:
> This patch basically remove references to the 'id' field from the static
> struct i2c_client client_template in ovcamchip_core.c, tda7313.c and
> saa7111-new.c) and update a deprecated function (usb_unlink_urb ->
> usb_kill_urb).

> diff -rbup ov511-2.28-orig/ovfx2.c ov511-2.28-new/ovfx2.c
> --- ov511-2.28-orig/ovfx2.c 2004-07-16 01:32:08.000000000 +0200
> +++ ov511-2.28-new/ovfx2.c 2005-09-24 14:00:12.000000000 +0200
> @@ -1678,7 +1678,11 @@ ovfx2_unlink_bulk(struct usb_ovfx2 *ov)
> /* Unschedule all of the bulk td's */
> for (n = OVFX2_NUMSBUF - 1; n >= 0; n--) {
> if (ov->sbuf[n].urb) {
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
> usb_unlink_urb(ov->sbuf[n].urb);
> +#else
> + usb_unlink_urb(ov->sbuf[n].urb);
> +#endif

This lines look suspicous to me. Do you meant usb_kill_urb in the >=
2.6.12 case?

Gregor

2005-09-27 18:16:34

by Laurent Meunier

[permalink] [raw]

Subject: Re: [PATCH] ov511-2.28 patch for 2.6.12 kernel compat.

>> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
>> usb_unlink_urb(ov->sbuf[n].urb);
>> +#else
>> + usb_unlink_urb(ov->sbuf[n].urb);
>> +#endif
>
>
> This lines look suspicous to me. Do you meant usb_kill_urb in the >=
> 2.6.12 case?
>
> Gregor
>

Yes, it should be usb_kill_urb in the >= 2.6.12 case. I made a mistake,
sorry for that.

diff -rbup ov511-2.28-orig/ovfx2.c ov511-2.28-new/ovfx2.c
--- ov511-2.28-orig/ovfx2.c 2004-07-16 01:32:08.000000000 +0200
+++ ov511-2.28-new/ovfx2.c 2005-09-27 20:12:54.000000000 +0200
@@ -1678,7 +1678,11 @@ ovfx2_unlink_bulk(struct usb_ovfx2 *ov)
/* Unschedule all of the bulk td's */
for (n = OVFX2_NUMSBUF - 1; n >= 0; n--) {
if (ov->sbuf[n].urb) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
+ usb_kill_urb(ov->sbuf[n].urb);
+#else
usb_unlink_urb(ov->sbuf[n].urb);
+#endif

Laurent