Commit 6a92a4e0 authored by Dave Jones's avatar Dave Jones
Browse files

[AGPGART] Lots of CodingStyle/whitespace cleanups. 



Eliminate trailing whitespace.
s/if(/if (/
s/for(/for (/

Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent a8b76b49

drivers/char/agp/agp.h

+5 −6
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ struct agp_bridge_driver { 
	void (*agp_enable)(struct agp_bridge_data *, u32);

	void (*cleanup)(void);

	void (*tlb_flush)(struct agp_memory *);

	unsigned long (*mask_memory)(struct agp_bridge_data *,

		unsigned long, int);

	unsigned long (*mask_memory)(struct agp_bridge_data *, unsigned long, int);

	void (*cache_flush)(void);

	int (*create_gatt_table)(struct agp_bridge_data *);

	int (*free_gatt_table)(struct agp_bridge_data *);

drivers/char/agp/alpha-agp.c

+8 −6
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ static struct page *alpha_core_agp_vm_nopage(struct vm_area_struct *vma, 
	dma_addr = address - vma->vm_start + agp->aperture.bus_base;

	pa = agp->ops->translate(agp, dma_addr);



	if (pa == (unsigned long)-EINVAL) return NULL;	/* no translation */

	if (pa == (unsigned long)-EINVAL)

		return NULL;	/* no translation */



	/*

	 * Get the page, inc the use count, and return it
@@ -98,7 +99,8 @@ static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, 


	temp = agp_bridge->current_size;

	num_entries = A_SIZE_FIX(temp)->num_entries;

	if ((pg_start + mem->page_count) > num_entries) return -EINVAL;

	if ((pg_start + mem->page_count) > num_entries)

		return -EINVAL;



	status = agp->ops->bind(agp, pg_start, mem);

	mb();

drivers/char/agp/intel-agp.c

+19 −26
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start, 
	temp = agp_bridge->current_size;

	num_entries = A_SIZE_FIX(temp)->num_entries;



	if ((pg_start + mem->page_count) > num_entries) {

	if ((pg_start + mem->page_count) > num_entries)

		return -EINVAL;

	}



	for (j = pg_start; j < (pg_start + mem->page_count); j++) {

		if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+j)))

			return -EBUSY;
@@ -1603,11 +1603,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i820";

		break;

	case PCI_DEVICE_ID_INTEL_82830_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82830_CGC)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82830_CGC))

			bridge->driver = &intel_830_driver;

		} else {

		else

			bridge->driver = &intel_830mp_driver;

		}

		name = "830M";

		break;

	case PCI_DEVICE_ID_INTEL_82840_HB:
@@ -1619,11 +1618,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i845";

		break;

	case PCI_DEVICE_ID_INTEL_82845G_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82845G_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82845G_IG))

			bridge->driver = &intel_830_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "845G";

		break;

	case PCI_DEVICE_ID_INTEL_82850_HB:
@@ -1648,11 +1646,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i860";

		break;

	case PCI_DEVICE_ID_INTEL_82865_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82865_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82865_IG))

			bridge->driver = &intel_830_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "865";

		break;

	case PCI_DEVICE_ID_INTEL_82875_HB:
@@ -1660,35 +1657,31 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i875";

		break;

	case PCI_DEVICE_ID_INTEL_82915G_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82915G_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82915G_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "915G";

		break;

	case PCI_DEVICE_ID_INTEL_82915GM_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82915GM_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82915GM_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "915GM";

		break;

	case PCI_DEVICE_ID_INTEL_82945G_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "945G";

		break;

	case PCI_DEVICE_ID_INTEL_82945GM_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "945GM";

		break;

	case PCI_DEVICE_ID_INTEL_7505_0:

drivers/char/agp/sworks-agp.c

+7 −8
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ static int serverworks_create_gatt_table(struct agp_bridge_data *bridge) 
	agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);



	/* Calculate the agp offset */



	for (i = 0; i < value->num_entries / 1024; i++)

		writel(virt_to_gart(serverworks_private.gatt_pages[i]->real)|1, page_dir.remapped+i);

drivers/char/agp/sis-agp.c

+4 −4

File changed.

Contains only whitespace changes.

drivers/char/agp/uninorth-agp.c

+6 −6

File changed.

Contains only whitespace changes.

drivers/char/agp/amd64-agp.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/char/agp/efficeon-agp.c

+8 −8

File changed.

Contains only whitespace changes.

drivers/char/agp/Kconfig

+1 −1

File changed.

Contains only whitespace changes.

drivers/char/agp/ali-agp.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/char/agp/ati-agp.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/char/agp/backend.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/char/agp/frontend.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/char/agp/isoch.c

+10 −10

File changed.

Contains only whitespace changes.

drivers/char/agp/generic.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/char/agp/hp-agp.c

+3 −3

File changed.

Contains only whitespace changes.

drivers/char/agp/i460-agp.c

+8 −8

File changed.

Contains only whitespace changes.

drivers/char/agp/nvidia-agp.c

+10 −10

File changed.

Contains only whitespace changes.

drivers/char/agp/sgi-agp.c

+1 −1

File changed.

Contains only whitespace changes.