1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index e5a76da86081..049e18667cd0 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1728,8 +1728,7 @@ static int meye_resume(struct pci_dev *pdev)
 }
 #endif
 
-static int __devinit meye_probe(struct pci_dev *pcidev,
-                                const struct pci_device_id *ent)
+static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
 {
         struct v4l2_device *v4l2_dev = &meye.v4l2_dev;
         int ret = -EBUSY;
@@ -1889,7 +1888,7 @@ outnotdev:
         return ret;
 }
 
-static void __devexit meye_remove(struct pci_dev *pcidev)
+static void meye_remove(struct pci_dev *pcidev)
 {
         video_unregister_device(meye.vdev);
 
@@ -1935,7 +1934,7 @@ static struct pci_driver meye_driver = {
         .name           = "meye",
         .id_table       = meye_pci_tbl,
         .probe          = meye_probe,
-        .remove         = __devexit_p(meye_remove),
+        .remove         = meye_remove,
 #ifdef CONFIG_PM
         .suspend        = meye_suspend,
         .resume         = meye_resume,
@@ -1945,7 +1944,7 @@ static struct pci_driver meye_driver = {
 static int __init meye_init(void)
 {
         gbuffers = max(2, min((int)gbuffers, MEYE_MAX_BUFNBRS));
-        if (gbufsize < 0 || gbufsize > MEYE_MAX_BUFSIZE)
+        if (gbufsize > MEYE_MAX_BUFSIZE)
                 gbufsize = MEYE_MAX_BUFSIZE;
         gbufsize = PAGE_ALIGN(gbufsize);
         printk(KERN_INFO "meye: using %d buffers with %dk (%dk total) "