Thanks for the fix.
I have tested the new suspend/resume on my kfir, and it works, and indeed
avoids warnings. I've commited it to cvs, after successfully creating
an MPEG stream with the changes.
However, I have not added the THIS_MODULE line.
What does it do? My built does not give warnings without the line.
Also, all other initializors in the struct have field specifiers, and
your addition does not. Is there any reason for this?
Bram
On Wed, 10 Apr 2002 17:10:16 +0200
Evgeny <[EMAIL PROTECTED]> wrote:
> HI!
>
> Now I work for integration of kfir-driver in my project.
> And I found some incorrectnesses in code of kfir.c:
>
> kfir.c:2772: warning: initialization from incompatible pointer type
> kfir.c:2773: warning: initialization from incompatible pointer type
>
> This is fix for it:
>
> driver> diff -u3 kfir.c.orig kfir.c
> --- kfir.c.orig Wed Apr 10 15:12:59 2002
> +++ kfir.c Tue Mar 19 12:25:44 2002
> @@ -2534,6 +2552,7 @@
>
> /* template for video_device-structure */
> static struct video_device kfir_template = {
> + THIS_MODULE,
> name: "Kfir",
> type: VID_TYPE_MPEG_ENCODER,
> hardware: VID_HARDWARE_SAA7146, //FIXME: need to get
> VID_HARDWARE_KFIR registered
> @@ -2745,14 +2764,16 @@
> return kfir_remove_device((struct kfir_dev *) pdev->driver_data);
> }
>
> -static void kfir_suspend(struct pci_dev *pdev)
> +static int kfir_suspend(struct pci_dev *pdev, u32 state)
> {
> printk("kfir: kfir_suspend()\n");
> + return 0;
> }
>
> -static void kfir_resume(struct pci_dev *pdev)
> +static int kfir_resume(struct pci_dev *pdev)
> {
> printk("kfir: kfir_resume()\n");
> + return 0;
> }
>
>
>
>
> I believe to repair this usefull.
>
>
> Best reards, Evgeny.
>
>
>
--
------------------------------------------------------------------------------
Bram Stolk, VR Specialist.
SARA Academic Computing Services Amsterdam, PO Box 94613, 1090 GP AMSTERDAM
email: [EMAIL PROTECTED] Phone +31-20-5923059 Fax +31-20-6683167
"I heard if you play the NT-4.0-CD backwards, you get a satanic message."
"Thats nothing, if you play it forward, it installs NT-4.0"
------------------------------------------------------------------------------
