@@ -11,7 +11,6 @@
* Code is based on s3fb
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -949,10 +948,6 @@ static int ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
int rc;
u8 regval;
- rc = aperture_remove_conflicting_pci_devices(dev, "arkfb");
- if (rc < 0)
- return rc;
-
/* Ignore secondary VGA device because there is no VGA arbitration */
if (! svga_primary_device(dev)) {
dev_info(&(dev->dev), "ignoring secondary device\n");
@@ -29,7 +29,6 @@
* more details.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -546,10 +545,6 @@ static int asiliantfb_pci_init(struct pci_dev *dp,
struct fb_info *p;
int err;
- err = aperture_remove_conflicting_pci_devices(dp, "asiliantfb");
- if (err)
- return err;
-
if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
return -ENODEV;
addr = pci_resource_start(dp, 0);
@@ -47,7 +47,6 @@
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
@@ -2056,10 +2055,6 @@ static int aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
void __iomem *bios = NULL;
#endif
- err = aperture_remove_conflicting_pci_devices(pdev, "aty128fb");
- if (err)
- return err;
-
/* Enable device in PCI config */
if ((err = pci_enable_device(pdev))) {
printk(KERN_ERR "aty128fb: Cannot enable PCI device: %d\n",
@@ -48,7 +48,6 @@
******************************************************************************/
-#include <linux/aperture.h>
#include <linux/compat.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
@@ -3534,11 +3533,7 @@ static int atyfb_pci_probe(struct pci_dev *pdev,
struct fb_info *info;
struct resource *rp;
struct atyfb_par *par;
- int rc;
-
- rc = aperture_remove_conflicting_pci_devices(pdev, "atyfb");
- if (rc)
- return rc;
+ int rc = -ENOMEM;
/* Enable device in PCI config */
if (pci_enable_device(pdev)) {
@@ -7,7 +7,6 @@
* - FB1 is display 1 with unique memory area
* - both display use 32 bit colors
*/
-#include <linux/aperture.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/fb.h>
@@ -615,10 +614,6 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
struct fb_info *info;
int ret;
- ret = aperture_remove_conflicting_pci_devices(dev, "carminefb");
- if (ret)
- return ret;
-
ret = pci_enable_device(dev);
if (ret)
return ret;
@@ -14,7 +14,6 @@
* more details.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -352,11 +351,7 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
struct fb_info *p;
unsigned long addr;
unsigned short cmd;
- int rc;
-
- rc = aperture_remove_conflicting_pci_devices(dp, "chipsfb");
- if (rc)
- return rc;
+ int rc = -ENODEV;
if (pci_enable_device(dp) < 0) {
dev_err(&dp->dev, "Cannot enable PCI device\n");
@@ -34,7 +34,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -2086,10 +2085,6 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
unsigned long board_addr, board_size;
int ret;
- ret = aperture_remove_conflicting_pci_devices(pdev, "cirrusfb");
- if (ret)
- return ret;
-
ret = pci_enable_device(pdev);
if (ret < 0) {
printk(KERN_ERR "cirrusfb: Cannot enable PCI device\n");
@@ -33,7 +33,6 @@
* (which, incidentally, is about the same saving as a 2.5in hard disk
* entering standby mode.)
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1720,10 +1719,6 @@ static int cyberpro_pci_probe(struct pci_dev *dev,
sprintf(name, "CyberPro%4X", id->device);
- err = aperture_remove_conflicting_pci_devices(dev, name);
- if (err)
- return err;
-
err = pci_enable_device(dev);
if (err)
return err;
@@ -6,7 +6,6 @@
* Copyright (C) 2005 Arcom Control Systems Ltd.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -321,10 +320,6 @@ static int gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct fb_info *info;
int ret;
- ret = aperture_remove_conflicting_pci_devices(pdev, "gx1fb");
- if (ret)
- return ret;
-
info = gx1fb_init_fbinfo(&pdev->dev);
if (!info)
return -ENOMEM;
@@ -15,7 +15,6 @@
*
* 16 MiB of framebuffer memory is assumed to be available.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -365,10 +364,6 @@ static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct fb_videomode *modedb_ptr;
unsigned int modedb_size;
- ret = aperture_remove_conflicting_pci_devices(pdev, "gxfb");
- if (ret)
- return ret;
-
info = gxfb_init_fbinfo(&pdev->dev);
if (!info)
return -ENOMEM;
@@ -6,7 +6,6 @@
* Built from gxfb (which is Copyright (C) 2006 Arcom Control Systems Ltd.)
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -485,10 +484,6 @@ static int lxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct fb_videomode *modedb_ptr;
unsigned int modedb_size;
- ret = aperture_remove_conflicting_pci_devices(pdev, "lxfb");
- if (ret)
- return ret;
-
info = lxfb_init_fbinfo(&pdev->dev);
if (info == NULL)
@@ -6,7 +6,6 @@
* Copyright (C) 2006 Paul Mackerras, IBM Corp. <paulus@samba.org>
*/
-#include <linux/aperture.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/fb.h>
@@ -622,10 +621,6 @@ static int gxt4500_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct fb_var_screeninfo var;
enum gxt_cards cardtype;
- err = aperture_remove_conflicting_pci_devices(pdev, "gxt4500fb");
- if (err)
- return err;
-
err = pci_enable_device(pdev);
if (err) {
dev_err(&pdev->dev, "gxt4500: cannot enable PCI device: %d\n",
@@ -12,7 +12,6 @@
* i740fb by Patrick LERDA, v0.9
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1014,10 +1013,6 @@ static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
bool found = false;
u8 *edid;
- ret = aperture_remove_conflicting_pci_devices(dev, "i740fb");
- if (ret)
- return ret;
-
info = framebuffer_alloc(sizeof(struct i740fb_par), &(dev->dev));
if (!info)
return -ENOMEM;
@@ -28,7 +28,6 @@
* more details.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -2017,10 +2016,6 @@ static int i810fb_init_pci(struct pci_dev *dev,
struct fb_videomode mode;
int err = -1, vfreq, hfreq, pixclock;
- err = aperture_remove_conflicting_pci_devices(dev, "i810fb");
- if (err)
- return err;
-
info = framebuffer_alloc(sizeof(struct i810fb_par), &dev->dev);
if (!info)
return -ENOMEM;
@@ -16,7 +16,6 @@
* more details.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1470,12 +1469,7 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct imstt_par *par;
struct fb_info *info;
struct device_node *dp;
- int ret;
-
- ret = aperture_remove_conflicting_pci_devices(pdev, "imsttfb");
- if (ret)
- return ret;
- ret = -ENOMEM;
+ int ret = -ENOMEM;
dp = pci_device_to_OF_node(pdev);
if(dp)
@@ -107,7 +107,6 @@
* Add support for 945GME. (Phil Endecott <spam_from_intelfb@chezphil.org>)
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -487,10 +486,6 @@ static int intelfb_pci_register(struct pci_dev *pdev,
DBG_MSG("intelfb_pci_register\n");
- err = aperture_remove_conflicting_pci_devices(pdev, "intelfb");
- if (err)
- return err;
-
num_registered++;
if (num_registered != 1) {
ERR_MSG("Attempted to register %d devices "
@@ -9,7 +9,6 @@
* for more details.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@ -677,10 +676,6 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
unsigned long size;
int err;
- err = aperture_remove_conflicting_pci_devices(pdev, "kyrofb");
- if (err)
- return err;
-
if ((err = pci_enable_device(pdev))) {
printk(KERN_WARNING "kyrofb: Can't enable pdev: %d\n", err);
return err;
@@ -100,7 +100,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/version.h>
#include "matroxfb_base.h"
@@ -2045,10 +2044,6 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
u_int32_t cmd;
DBG(__func__)
- err = aperture_remove_conflicting_pci_devices(pdev, "matroxfb");
- if (err)
- return err;
-
svid = pdev->subsystem_vendor;
sid = pdev->subsystem_device;
for (b = dev_list; b->vendor; b++) {
@@ -10,7 +10,6 @@
#undef DEBUG
-#include <linux/aperture.h>
#include <linux/fb.h>
#include <linux/delay.h>
#include <linux/uaccess.h>
@@ -1000,10 +999,6 @@ static int mb862xx_pci_probe(struct pci_dev *pdev,
struct device *dev = &pdev->dev;
int ret;
- ret = aperture_remove_conflicting_pci_devices(pdev, "mb862xxfb");
- if (ret)
- return ret;
-
ret = pci_enable_device(pdev);
if (ret < 0) {
dev_err(dev, "Cannot enable PCI device\n");
@@ -54,7 +54,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -2030,10 +2029,6 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id)
DBG("neofb_probe");
- err = aperture_remove_conflicting_pci_devices(dev, "neofb");
- if (err)
- return err;
-
err = pci_enable_device(dev);
if (err)
return err;
@@ -9,7 +9,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1277,15 +1276,11 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
struct nvidia_par *par;
struct fb_info *info;
unsigned short cmd;
- int ret;
+
NVTRACE_ENTER();
assert(pd != NULL);
- ret = aperture_remove_conflicting_pci_devices(pd, "nvidiafb");
- if (ret)
- return ret;
-
info = framebuffer_alloc(sizeof(struct nvidia_par), &pd->dev);
if (!info)
@@ -27,7 +27,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
@@ -1522,10 +1521,6 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
int err;
int retval = -ENXIO;
- err = aperture_remove_conflicting_pci_devices(pdev, "pm2fb");
- if (err)
- return err;
-
err = pci_enable_device(pdev);
if (err) {
printk(KERN_WARNING "pm2fb: Can't enable pdev: %d\n", err);
@@ -22,7 +22,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1316,10 +1315,6 @@ static int pm3fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
int err;
int retval = -ENXIO;
- err = aperture_remove_conflicting_pci_devices(dev, "pm3fb");
- if (err)
- return err;
-
err = pci_enable_device(dev);
if (err) {
printk(KERN_WARNING "pm3fb: Can't enable PCI dev: %d\n", err);
@@ -45,7 +45,6 @@
#undef DEBUG
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -943,10 +942,6 @@ static int pvr2fb_pci_probe(struct pci_dev *pdev,
{
int ret;
- ret = aperture_remove_conflicting_pci_devices(pdev, "pvrfb");
- if (ret)
- return ret;
-
ret = pci_enable_device(pdev);
if (ret) {
printk(KERN_ERR "pvr2fb: PCI enable failed\n");
@@ -29,7 +29,6 @@
* doublescan modes are broken
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1899,10 +1898,6 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
NVTRACE_ENTER();
assert(pd != NULL);
- ret = aperture_remove_conflicting_pci_devices(pd, "rivafb");
- if (ret)
- return ret;
-
info = framebuffer_alloc(sizeof(struct riva_par), &pd->dev);
if (!info) {
ret = -ENOMEM;
@@ -11,7 +11,6 @@
* which is based on the code of neofb.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1132,10 +1131,6 @@ static int s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
return -ENODEV;
}
- rc = aperture_remove_conflicting_pci_devices(dev, "s3fb");
- if (rc)
- return rc;
-
/* Allocate and fill driver data structure */
info = framebuffer_alloc(sizeof(struct s3fb_info), &(dev->dev));
if (!info)
@@ -41,7 +41,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -2177,10 +2176,6 @@ static int savagefb_probe(struct pci_dev *dev, const struct pci_device_id *id)
DBG("savagefb_probe");
- err = aperture_remove_conflicting_pci_devices(dev, "savagefb");
- if (err)
- return err;
-
info = framebuffer_alloc(sizeof(struct savagefb_par), &dev->dev);
if (!info)
return -ENOMEM;
@@ -19,7 +19,6 @@
* which is (c) 1998 Gerd Knorr <kraxel@goldbach.in-berlin.de>
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
@@ -5862,10 +5861,6 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if(sisfb_off)
return -ENXIO;
- ret = aperture_remove_conflicting_pci_devices(pdev, "sisfb");
- if (ret)
- return ret;
-
sis_fb_info = framebuffer_alloc(sizeof(*ivideo), &pdev->dev);
if(!sis_fb_info)
return -ENOMEM;
@@ -42,7 +42,6 @@
* more details.
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -667,13 +666,6 @@ static int xxxfb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
struct device *device = &dev->dev; /* or &pdev->dev */
int cmap_len, retval;
- /*
- * Remove firmware-based drivers that create resource conflicts.
- */
- retval = aperture_remove_conflicting_pci_devices(pdev, "xxxfb");
- if (retval)
- return retval;
-
/*
* Dynamically allocate info and par
*/
@@ -18,7 +18,6 @@
* Framebuffer driver for Silicon Motion SM710, SM712, SM721 and SM722 chips
*/
-#include <linux/aperture.h>
#include <linux/io.h>
#include <linux/fb.h>
#include <linux/pci.h>
@@ -1503,10 +1502,6 @@ static int smtcfb_pci_probe(struct pci_dev *pdev,
dev_info(&pdev->dev, "Silicon Motion display driver.\n");
- err = aperture_remove_conflicting_pci_devices(pdev, "smtcfb");
- if (err)
- return err;
-
err = pci_enable_device(pdev); /* enable SMTC chip */
if (err)
return err;
@@ -80,7 +80,6 @@
* Includes
*/
-#include <linux/aperture.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -1327,10 +1326,6 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct sst_spec *spec;
int err;
- err = aperture_remove_conflicting_pci_devices(pdev, "sstfb");
- if (err)
- return err;
-
/* Enable device in PCI config. */
if ((err=pci_enable_device(pdev))) {
printk(KERN_ERR "cannot enable device\n");
@@ -5,7 +5,6 @@
* Copyright (C) 2007 David S. Miller (davem@davemloft.net)
*/
-#include <linux/aperture.h>
#include <linux/kernel.h>
#include <linux/fb.h>
#include <linux/pci.h>
@@ -124,10 +123,6 @@ static int s3d_pci_register(struct pci_dev *pdev,
struct s3d_info *sp;
int err;
- err = aperture_remove_conflicting_pci_devices(pdev, "s3dfb");
- if (err)
- return err;
-
err = pci_enable_device(pdev);
if (err < 0) {
printk(KERN_ERR "s3d: Cannot enable PCI device %s\n",
@@ -5,7 +5,6 @@
* Copyright (C) 2007 David S. Miller (davem@davemloft.net)
*/
-#include <linux/aperture.h>
#include <linux/kernel.h>
#include <linux/fb.h>
#include <linux/pci.h>
@@ -250,10 +249,6 @@ static int e3d_pci_register(struct pci_dev *pdev,
unsigned int line_length;
int err;
- err = aperture_remove_conflicting_pci_devices(pdev, "e3dfb");
- if (err)
- return err;
-
of_node = pci_device_to_OF_node(pdev);
if (!of_node) {
printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
@@ -64,7 +64,6 @@
*
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -1377,10 +1376,6 @@ static int tdfxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct fb_monspecs *specs;
bool found;
- err = aperture_remove_conflicting_pci_devices(pdev, "tdfxfb");
- if (err)
- return err;
-
err = pci_enable_device(pdev);
if (err) {
printk(KERN_ERR "tdfxfb: Can't enable pdev: %d\n", err);
@@ -12,7 +12,6 @@
* more details.
*/
-#include <linux/aperture.h>
#include <linux/bitrev.h>
#include <linux/compiler.h>
#include <linux/delay.h>
@@ -107,12 +106,6 @@ static struct pci_driver tgafb_pci_driver = {
static int tgafb_pci_register(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
- int ret;
-
- ret = aperture_remove_conflicting_pci_devices(pdev, "tgafb");
- if (ret)
- return ret;
-
return tgafb_register(&pdev->dev);
}
@@ -16,7 +16,6 @@
* timing value tweaking so it looks good on every monitor in every mode
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/fb.h>
#include <linux/init.h>
@@ -1466,10 +1465,6 @@ static int trident_pci_probe(struct pci_dev *dev,
int chip_id;
bool found = false;
- err = aperture_remove_conflicting_pci_devices(dev, "tridentfb");
- if (err)
- return err;
-
err = pcim_enable_device(dev);
if (err)
return err;
@@ -14,7 +14,6 @@
* Alan Hourihane <alanh-at-tungstengraphics-dot-com>
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -445,11 +444,7 @@ static int vml_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
struct vml_info *vinfo;
struct fb_info *info;
struct vml_par *par;
- int err;
-
- err = aperture_remove_conflicting_pci_devices(dev, "vmlfb");
- if (err)
- return err;
+ int err = 0;
par = kzalloc(sizeof(*par), GFP_KERNEL);
if (par == NULL)
@@ -8,7 +8,6 @@
/*
* Core code for the Via multifunction framebuffer device.
*/
-#include <linux/aperture.h>
#include <linux/via-core.h>
#include <linux/via_i2c.h>
#include <linux/via-gpio.h>
@@ -618,10 +617,6 @@ static int via_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
int ret;
- ret = aperture_remove_conflicting_pci_devices(pdev, "viafb");
- if (ret)
- return ret;
-
ret = pci_enable_device(pdev);
if (ret)
return ret;
@@ -12,7 +12,6 @@
* (http://davesdomain.org.uk/viafb/)
*/
-#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -673,10 +672,6 @@ static int vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
return -ENODEV;
}
- rc = aperture_remove_conflicting_pci_devices(dev, "vt8623fb");
- if (rc)
- return rc;
-
/* Allocate and fill driver data structure */
info = framebuffer_alloc(sizeof(struct vt8623fb_info), &(dev->dev));
if (!info)