Merge tag 'md/3.15' of git://neil.brown.name/md

[karo-tx-linux.git] / drivers / video / neofb.c

diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index c172a5281f9e6c9369b0cec236e3bbf2abb875ac..44f99a60bb9b768a9bcef3e8f3520dd0636d6222 100644 (file)
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -2106,8 +2106,7 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (err < 0)
                goto err_reg_fb;
 
-       printk(KERN_INFO "fb%d: %s frame buffer device\n",
-              info->node, info->fix.id);
+       fb_info(info, "%s frame buffer device\n", info->fix.id);
 
        /*
         * Our driver data
@@ -2148,12 +2147,6 @@ static void neofb_remove(struct pci_dev *dev)
                fb_destroy_modedb(info->monspecs.modedb);
                neo_unmap_mmio(info);
                neo_free_fb_info(info);
-
-               /*
-                * Ensure that the driver data is no longer
-                * valid.
-                */
-               pci_set_drvdata(dev, NULL);
        }
 }