[Linux-mips-commits]CVS: linux/arch/mips/mm c-r4k.c,1.7,1.8

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv15643/arch/mips/mm

Modified Files:
	c-r4k.c 
Log Message:
General cleanups, return instead of jumping to a useless label. Keeps gcc 3.0.4
happy.



Index: c-r4k.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r4k.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- c-r4k.c	18 Mar 2002 22:40:31 -0000	1.7
+++ c-r4k.c	21 Apr 2002 06:43:20 -0000	1.8
@@ -512,7 +512,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -530,7 +530,6 @@
 		blast_scache16_page_indexed(page);
 	} else
 		blast_scache16_page(page);
-out:
 }
 
 static void r4k_flush_cache_page_s32d16i16(struct vm_area_struct *vma,
@@ -560,7 +559,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -578,7 +577,6 @@
 		blast_scache32_page_indexed(page);
 	} else
 		blast_scache32_page(page);
-out:
 }
 
 static void r4k_flush_cache_page_s64d16i16(struct vm_area_struct *vma,
@@ -608,7 +606,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -626,7 +624,6 @@
 		blast_scache64_page_indexed(page);
 	} else
 		blast_scache64_page(page);
-out:
 }
 
 static void r4k_flush_cache_page_s128d16i16(struct vm_area_struct *vma,
@@ -657,7 +654,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -675,7 +672,6 @@
 		blast_scache128_page_indexed(page);
 	} else
 		blast_scache128_page(page);
-out:
 }
 
 static void r4k_flush_cache_page_s32d32i32(struct vm_area_struct *vma,
@@ -706,7 +702,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -724,7 +720,6 @@
 		blast_scache32_page_indexed(page);
 	} else
 		blast_scache32_page(page);
-out:
 }
 
 static void r4k_flush_cache_page_s64d32i32(struct vm_area_struct *vma,
@@ -755,7 +750,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -773,7 +768,6 @@
 		blast_scache64_page_indexed(page);
 	} else
 		blast_scache64_page(page);
-out:
 }
 
 static void r4k_flush_cache_page_s128d32i32(struct vm_area_struct *vma,
@@ -804,7 +798,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -821,7 +815,6 @@
 		blast_scache128_page_indexed(page);
 	} else
 		blast_scache128_page(page);
-out:
 }
 
 static void r4k_flush_cache_page_d16i16(struct vm_area_struct *vma,
@@ -852,7 +845,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_VALID))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -869,7 +862,6 @@
 		page = (KSEG0 + (page & (dcache_size - 1)));
 		blast_dcache16_page_indexed(page);
 	}
-out:
 }
 
 static void r4k_flush_cache_page_d32i32(struct vm_area_struct *vma,
@@ -900,7 +892,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_PRESENT))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -918,7 +910,6 @@
 		page = (KSEG0 + (page & (dcache_size - 1)));
 		blast_dcache32_page_indexed(page);
 	}
-out:
 }
 
 static void r4k_flush_cache_page_d32i32_r4600(struct vm_area_struct *vma,
@@ -949,7 +940,7 @@
 	 * in the cache.
 	 */
 	if (!(pte_val(*ptep) & _PAGE_PRESENT))
-		goto out;
+		return;
 
 	/*
 	 * Doing flushes for another ASID than the current one is
@@ -967,7 +958,6 @@
 		blast_dcache32_page_indexed(page);
 		blast_dcache32_page_indexed(page ^ dcache_waybit);
 	}
-out:
 }
 
 /* If the addresses passed to these routines are valid, they are