Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3cf6951 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Dave Airlie
Browse files

agp: use dev_printk when possible 



Convert printks to use dev_printk().

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 55814b74

drivers/char/agp/ali-agp.c

+5 −5
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ static int ali_configure(void) 


		nlvm_addr+= agp_bridge->gart_bus_addr;

		nlvm_addr|=(agp_bridge->gart_bus_addr>>12);

		printk(KERN_INFO PFX "nlvm top &base = %8x\n",nlvm_addr);

		dev_info(&agp_bridge->dev->dev, "nlvm top &base = %8x\n",

			 nlvm_addr);

	}

#endif
@@ -315,8 +316,8 @@ static int __devinit agp_ali_probe(struct pci_dev *pdev, 
			goto found;

	}



	printk(KERN_ERR PFX "Unsupported ALi chipset (device id: %04x)\n",

	     pdev->device);

	dev_err(&pdev->dev, "unsupported ALi chipset [%04x/%04x])\n",

		pdev->vendor, pdev->device);

	return -ENODEV;
@@ -361,8 +362,7 @@ static int __devinit agp_ali_probe(struct pci_dev *pdev, 
		bridge->driver = &ali_generic_bridge;

	}



	printk(KERN_INFO PFX "Detected ALi %s chipset\n",

			devs[j].chipset_name);

	dev_info(&pdev->dev, "ALi %s chipset\n", devs[j].chipset_name);



	/* Fill in the mode register */

	pci_read_config_dword(pdev,

drivers/char/agp/amd-k7-agp.c

+5 −5
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, 
		return -ENODEV;



	j = ent - agp_amdk7_pci_table;

	printk(KERN_INFO PFX "Detected AMD %s chipset\n",

	dev_info(&pdev->dev, "AMD %s chipset\n",

		 amd_agp_device_ids[j].chipset_name);



	bridge = agp_alloc_bridge();
@@ -442,7 +442,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, 
		while (!cap_ptr) {

			gfxcard = pci_get_class(PCI_CLASS_DISPLAY_VGA<<8, gfxcard);

			if (!gfxcard) {

				printk (KERN_INFO PFX "Couldn't find an AGP VGA controller.\n");

				dev_info(&pdev->dev, "no AGP VGA controller\n");

				return -ENODEV;

			}

			cap_ptr = pci_find_capability(gfxcard, PCI_CAP_ID_AGP);
@@ -453,7 +453,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, 
		   (if necessary at all). */

		if (gfxcard->vendor == PCI_VENDOR_ID_NVIDIA) {

			agp_bridge->flags |= AGP_ERRATA_1X;

			printk (KERN_INFO PFX "AMD 751 chipset with NVidia GeForce detected. Forcing to 1X due to errata.\n");

			dev_info(&pdev->dev, "AMD 751 chipset with NVidia GeForce; forcing 1X due to errata\n");

		}

		pci_dev_put(gfxcard);

	}
@@ -469,7 +469,7 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, 
			agp_bridge->flags = AGP_ERRATA_FASTWRITES;

			agp_bridge->flags |= AGP_ERRATA_SBA;

			agp_bridge->flags |= AGP_ERRATA_1X;

			printk (KERN_INFO PFX "AMD 761 chipset with errata detected - disabling AGP fast writes & SBA and forcing to 1X.\n");

			dev_info(&pdev->dev, "AMD 761 chipset with errata; disabling AGP fast writes & SBA and forcing to 1X\n");

		}

	}

drivers/char/agp/amd64-agp.c

+18 −18
Original line number Diff line number Diff line
@@ -294,12 +294,13 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, 
	 * so let double check that order, and lets trust the AMD NB settings

	 */

	if (order >=0 && aper + (32ULL<<(20 + order)) > 0x100000000ULL) {

		printk(KERN_INFO "Aperture size %u MB is not right, using settings from NB\n",

		dev_info(&agp->dev, "aperture size %u MB is not right, using settings from NB\n",

			 32 << order);

		order = nb_order;

	}



	printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order);

	dev_info(&agp->dev, "aperture from AGP @ %Lx size %u MB\n",

		 aper, 32 << order);

	if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order))

		return -1;
@@ -320,10 +321,10 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr) 
	for (i = 0; i < num_k8_northbridges; i++) {

		struct pci_dev *dev = k8_northbridges[i];

		if (fix_northbridge(dev, pdev, cap_ptr) < 0) {

			printk(KERN_ERR PFX "No usable aperture found.\n");

			dev_err(&dev->dev, "no usable aperture found\n");

#ifdef __x86_64__

			/* should port this to i386 */

			printk(KERN_ERR PFX "Consider rebooting with iommu=memaper=2 to get a good aperture.\n");

			dev_err(&dev->dev, "consider rebooting with iommu=memaper=2 to get a good aperture\n");

#endif

			return -1;

		}
@@ -346,14 +347,14 @@ static void __devinit amd8151_init(struct pci_dev *pdev, struct agp_bridge_data 
	default:   revstring="??"; break;

	}



	printk (KERN_INFO PFX "Detected AMD 8151 AGP Bridge rev %s\n", revstring);

	dev_info(&pdev->dev, "AMD 8151 AGP Bridge rev %s\n", revstring);



	/*

	 * Work around errata.

	 * Chips before B2 stepping incorrectly reporting v3.5

	 */

	if (pdev->revision < 0x13) {

		printk (KERN_INFO PFX "Correcting AGP revision (reports 3.5, is really 3.0)\n");

		dev_info(&pdev->dev, "correcting AGP revision (reports 3.5, is really 3.0)\n");

		bridge->major_version = 3;

		bridge->minor_version = 0;

	}
@@ -376,11 +377,11 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) 
	struct pci_dev *dev1;

	int i;

	unsigned size = amd64_fetch_size();

	printk(KERN_INFO "Setting up ULi AGP.\n");



	dev_info(&pdev->dev, "setting up ULi AGP\n");

	dev1 = pci_get_slot (pdev->bus,PCI_DEVFN(0,0));

	if (dev1 == NULL) {

		printk(KERN_INFO PFX "Detected a ULi chipset, "

			"but could not fine the secondary device.\n");

		dev_info(&pdev->dev, "can't find ULi secondary device\n");

		return -ENODEV;

	}
@@ -389,7 +390,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) 
			break;



	if (i == ARRAY_SIZE(uli_sizes)) {

		printk(KERN_INFO PFX "No ULi size found for %d\n", size);

		dev_info(&pdev->dev, "no ULi size found for %d\n", size);

		return -ENODEV;

	}
@@ -434,13 +435,11 @@ static int nforce3_agp_init(struct pci_dev *pdev) 
	int i;

	unsigned size = amd64_fetch_size();



	printk(KERN_INFO PFX "Setting up Nforce3 AGP.\n");

	dev_info(&pdev->dev, "setting up Nforce3 AGP\n");



	dev1 = pci_get_slot(pdev->bus, PCI_DEVFN(11, 0));

	if (dev1 == NULL) {

		printk(KERN_INFO PFX "agpgart: Detected an NVIDIA "

			"nForce3 chipset, but could not find "

			"the secondary device.\n");

		dev_info(&pdev->dev, "can't find Nforce3 secondary device\n");

		return -ENODEV;

	}
@@ -449,7 +448,7 @@ static int nforce3_agp_init(struct pci_dev *pdev) 
			break;



	if (i == ARRAY_SIZE(nforce3_sizes)) {

		printk(KERN_INFO PFX "No NForce3 size found for %d\n", size);

		dev_info(&pdev->dev, "no NForce3 size found for %d\n", size);

		return -ENODEV;

	}
@@ -463,7 +462,7 @@ static int nforce3_agp_init(struct pci_dev *pdev) 


	/* if x86-64 aperture base is beyond 4G, exit here */

	if ( (apbase & 0x7fff) >> (32 - 25) ) {

		printk(KERN_INFO PFX "aperture base > 4G\n");

		dev_info(&pdev->dev, "aperture base > 4G\n");

		return -ENODEV;

	}
@@ -506,7 +505,8 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev, 
	    pdev->device == PCI_DEVICE_ID_AMD_8151_0) {

		amd8151_init(pdev, bridge);

	} else {

		printk(KERN_INFO PFX "Detected AGP bridge %x\n", pdev->devfn);

		dev_info(&pdev->dev, "AGP bridge [%04x/%04x]\n",

			 pdev->vendor, pdev->device);

	}



	bridge->driver = &amd_8151_driver;

drivers/char/agp/ati-agp.c

+3 −4
Original line number Diff line number Diff line
@@ -486,8 +486,8 @@ static int __devinit agp_ati_probe(struct pci_dev *pdev, 
			goto found;

	}



	printk(KERN_ERR PFX

	     "Unsupported Ati chipset (device id: %04x)\n", pdev->device);

	dev_err(&pdev->dev, "unsupported Ati chipset [%04x/%04x])\n",

		pdev->vendor, pdev->device);

	return -ENODEV;



found:
@@ -500,8 +500,7 @@ static int __devinit agp_ati_probe(struct pci_dev *pdev, 


	bridge->driver = &ati_generic_bridge;



	printk(KERN_INFO PFX "Detected Ati %s chipset\n",

			devs[j].chipset_name);

	dev_info(&pdev->dev, "Ati %s chipset\n", devs[j].chipset_name);



	/* Fill in the mode register */

	pci_read_config_dword(pdev,

drivers/char/agp/backend.c

+15 −11
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 
		void *addr = bridge->driver->agp_alloc_page(bridge);



		if (!addr) {

			printk(KERN_ERR PFX "unable to get memory for scratch page.\n");

			dev_err(&bridge->dev->dev,

				"can't get memory for scratch page\n");

			return -ENOMEM;

		}
@@ -155,13 +156,13 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 


	size_value = bridge->driver->fetch_size();

	if (size_value == 0) {

		printk(KERN_ERR PFX "unable to determine aperture size.\n");

		dev_err(&bridge->dev->dev, "can't determine aperture size\n");

		rc = -EINVAL;

		goto err_out;

	}

	if (bridge->driver->create_gatt_table(bridge)) {

		printk(KERN_ERR PFX

		    "unable to get memory for graphics translation table.\n");

		dev_err(&bridge->dev->dev,

			"can't get memory for graphics translation table\n");

		rc = -ENOMEM;

		goto err_out;

	}
@@ -169,7 +170,8 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 


	bridge->key_list = vmalloc(PAGE_SIZE * 4);

	if (bridge->key_list == NULL) {

		printk(KERN_ERR PFX "error allocating memory for key lists.\n");

		dev_err(&bridge->dev->dev,

			"can't allocate memory for key lists\n");

		rc = -ENOMEM;

		goto err_out;

	}
@@ -179,7 +181,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) 
	memset(bridge->key_list, 0, PAGE_SIZE * 4);



	if (bridge->driver->configure()) {

		printk(KERN_ERR PFX "error configuring host chipset.\n");

		dev_err(&bridge->dev->dev, "error configuring host chipset\n");

		rc = -EINVAL;

		goto err_out;

	}
@@ -269,24 +271,26 @@ int agp_add_bridge(struct agp_bridge_data *bridge) 


	/* Grab reference on the chipset driver. */

	if (!try_module_get(bridge->driver->owner)) {

		printk (KERN_INFO PFX "Couldn't lock chipset driver.\n");

		dev_info(&bridge->dev->dev, "can't lock chipset driver\n");

		return -EINVAL;

	}



	error = agp_backend_initialize(bridge);

	if (error) {

		printk (KERN_INFO PFX "agp_backend_initialize() failed.\n");

		dev_info(&bridge->dev->dev,

			 "agp_backend_initialize() failed\n");

		goto err_out;

	}



	if (list_empty(&agp_bridges)) {

		error = agp_frontend_initialize();

		if (error) {

			printk (KERN_INFO PFX "agp_frontend_initialize() failed.\n");

			dev_info(&bridge->dev->dev,

				 "agp_frontend_initialize() failed\n");

			goto frontend_err;

		}



		printk(KERN_INFO PFX "AGP aperture is %dM @ 0x%lx\n",

		dev_info(&bridge->dev->dev, "AGP aperture is %dM @ 0x%lx\n",

			 bridge->driver->fetch_size(), bridge->gart_bus_addr);



	}