media: saa7164: fix remove_proc_entry warning

[platform/kernel/linux-rpi.git] / drivers / media / pci / saa7164 / saa7164-core.c

diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index 05f25c9..f5ad3cf 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1122,16 +1122,25 @@ static int saa7164_proc_show(struct seq_file *m, void *v)
        return 0;
 }
 
+static struct proc_dir_entry *saa7164_pe;
+
 static int saa7164_proc_create(void)
 {
-       struct proc_dir_entry *pe;
-
-       pe = proc_create_single("saa7164", S_IRUGO, NULL, saa7164_proc_show);
-       if (!pe)
+       saa7164_pe = proc_create_single("saa7164", 0444, NULL, saa7164_proc_show);
+       if (!saa7164_pe)
                return -ENOMEM;
 
        return 0;
 }
+
+static void saa7164_proc_destroy(void)
+{
+       if (saa7164_pe)
+               remove_proc_entry("saa7164", NULL);
+}
+#else
+static int saa7164_proc_create(void) { return 0; }
+static void saa7164_proc_destroy(void) {}
 #endif
 
 static int saa7164_thread_function(void *data)
@@ -1503,19 +1512,21 @@ static struct pci_driver saa7164_pci_driver = {
 
 static int __init saa7164_init(void)
 {
-       printk(KERN_INFO "saa7164 driver loaded\n");
+       int ret = pci_register_driver(&saa7164_pci_driver);
+
+       if (ret)
+               return ret;
 
-#ifdef CONFIG_PROC_FS
        saa7164_proc_create();
-#endif
-       return pci_register_driver(&saa7164_pci_driver);
+
+       pr_info("saa7164 driver loaded\n");
+
+       return 0;
 }
 
 static void __exit saa7164_fini(void)
 {
-#ifdef CONFIG_PROC_FS
-       remove_proc_entry("saa7164", NULL);
-#endif
+       saa7164_proc_destroy();
        pci_unregister_driver(&saa7164_pci_driver);
 }