PERFORCE change 123167 for review

Rui Paulo rpaulo at FreeBSD.org
Mon Jul 9 02:07:42 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=123167

Change 123167 by rpaulo at rpaulo_epsilon on 2007/07/09 02:06:43

	Style cleanup.	

Affected files ...

.. //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#9 edit

Differences ...

==== //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#9 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#8 $
+ * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/backlight/backlight.c#9 $
  *
  */
 
@@ -113,7 +113,7 @@
 
 	if (pci_get_class(dev) != PCIC_DISPLAY
 	    || pci_get_subclass(dev) != PCIS_DISPLAY_VGA)
-		return NULL;
+		return (NULL);
 
 	vendor = pci_get_vendor(dev);
 	devid = pci_get_device(dev);
@@ -125,13 +125,13 @@
 		    !strncmp(model, backlight_models[i].bm_model,
 			strlen(model))) {
 			freeenv(model);
-			return &backlight_models[i];
+			return (&backlight_models[i]);
 		}
 	}
 
 	freeenv(model);
 
-	return NULL;
+	return (NULL);
 }
 
 static void
@@ -150,16 +150,16 @@
 	struct backlight_model *model;
 
 	if (resource_disabled("backlight", 0))
-		return ENXIO;
+		return (ENXIO);
 
 	model = backlight_match(dev);
 	
 	if (!model)
-		return ENXIO;
+		return (ENXIO);
 
 	device_set_desc(dev, model->bm_desc);
 
-	return BUS_PROBE_GENERIC;
+	return (BUS_PROBE_GENERIC);
 }
 
 static int
@@ -173,7 +173,7 @@
 
 	error = model->bm_attach(dev);
 	if (error)
-		return error;
+		return (error);
 
 	sysctl_ctx_init(&sc->sc_sysctl_ctx);
 	sc->sc_sysctl_tree = SYSCTL_ADD_NODE(&sc->sc_sysctl_ctx,
@@ -194,7 +194,7 @@
 	    sc, 0, model->bm_level, "I",
 	    "Brightness level of the backlight");
 
-	return 0;
+	return (0);
 }
 
 static int
@@ -204,7 +204,7 @@
 
 	sysctl_ctx_free(&sc->sc_sysctl_ctx);
 
-	return 0;
+	return (0);
 }
 
 /*
@@ -237,7 +237,7 @@
 	max = bus_read_4(sc->sc_res, BACKLIGHT_MB_OFFSET);
 	max = max >> BACKLIGHT_MB_MAX_SHIFT;
 
-	return max;
+	return (max);
 }
 
 static uint32_t
@@ -248,7 +248,7 @@
 	level = bus_read_4(sc->sc_res, BACKLIGHT_MB_OFFSET);
 	level = level >> BACKLIGHT_MB_CUR_SHIFT & BACKLIGHT_MB_CUR_MASK;
 
-	return level;
+	return (level);
 }
 
 static void
@@ -275,19 +275,19 @@
 	sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
 	    RF_ACTIVE);
 	if (sc->sc_res == NULL)
-		return ENOMEM;
+		return (ENOMEM);
 
 	max = macbook_get_max(sc);
 	if (max > BACKLIGHT_MB_MAX) {
 		device_printf(dev, "maximum brightness level out of range"
 		    "(0x%x) - please send-pr\n", max);
-		return EINVAL;
+		return (EINVAL);
 	}
 
 	sc->sc_enable = macbook_get_current(sc) >= BACKLIGHT_MB_MIN ? 1 : 0;
 	sc->sc_level  = macbook_get_current(sc);
 
-	return 0;
+	return (0);
 }
 
 static int
@@ -315,14 +315,14 @@
 			macbook_set_current(sc, sc->sc_level);
 			break;
 		default:
-			return EINVAL;
+			return (EINVAL);
 
 		}
 		*(unsigned int *)oidp->oid_arg1 = enable;
 	}
 
 
-	return error;
+	return (error);
 }
 
 static int
@@ -344,7 +344,7 @@
 		level = *(unsigned int *)req->newptr;
 
 		if (level > 100)
-			return EINVAL;
+			return (EINVAL);
 		
 		curlevel = (level * (BACKLIGHT_MB_MAX - BACKLIGHT_MB_MIN) 
 		    / 100) + BACKLIGHT_MB_MIN;
@@ -355,5 +355,5 @@
 
 	}
 
-	return error;
+	return (error);
 }


More information about the p4-projects mailing list