From owner-p4-projects@FreeBSD.ORG  Thu Jan  7 11:51:10 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 18F481065670; Thu,  7 Jan 2010 11:51:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D1A7A106566B
	for <perforce@freebsd.org>; Thu,  7 Jan 2010 11:51:09 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BFCF18FC12
	for <perforce@freebsd.org>; Thu,  7 Jan 2010 11:51:09 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o07Bp90j051222
	for <perforce@freebsd.org>; Thu, 7 Jan 2010 11:51:09 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07Bp9iQ051220
	for perforce@freebsd.org; Thu, 7 Jan 2010 11:51:09 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 7 Jan 2010 11:51:09 GMT
Message-Id: <201001071151.o07Bp9iQ051220@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 172722 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2010 11:51:10 -0000

http://p4web.freebsd.org/chv.cgi?CH=172722

Change 172722 by raj@raj_fdt on 2010/01/07 11:50:47

	Unobfuscate the code.
	
	Submitted by:	imp	

Affected files ...

.. //depot/projects/fdt/sys/dev/tsec/if_tsec_fdt.c#2 edit
.. //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#2 edit

Differences ...

==== //depot/projects/fdt/sys/dev/tsec/if_tsec_fdt.c#2 (text+ko) ====

@@ -232,8 +232,8 @@
 {
 	int error;
 
-	(*ires) = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, irid, RF_ACTIVE);
-	if ((*ires) == NULL) {
+	*ires = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, irid, RF_ACTIVE);
+	if (*ires == NULL) {
 		device_printf(sc->dev, "could not allocate %s IRQ\n", iname);
 		return (ENXIO);
 	}
@@ -243,7 +243,7 @@
 		device_printf(sc->dev, "failed to set up %s IRQ\n", iname);
 		if (bus_release_resource(sc->dev, SYS_RES_IRQ, *irid, *ires))
 			device_printf(sc->dev, "could not release %s IRQ\n", iname);
-		(*ires) = NULL;
+		*ires = NULL;
 		return (error);
 	}
 	return (0);

==== //depot/projects/fdt/sys/dev/uart/uart_bus_fdt.c#2 (text+ko) ====

@@ -63,15 +63,15 @@
 	phandle_t node;
 	pcell_t clock, shift;
 
-	if (ofw_bus_is_compatible(dev, "ns16550")) {
-		sc = device_get_softc(dev);
-		sc->sc_class = &uart_ns8250_class;
+	if (!ofw_bus_is_compatible(dev, "ns16550"))
+		return (ENXIO);
+
+	sc = device_get_softc(dev);
+	sc->sc_class = &uart_ns8250_class;
 
-		node = ofw_bus_get_node(dev);
-		if ((OF_getprop(node, "clock-frequency", &clock,
-		    sizeof(clock))) <= 0)
-			return (ENXIO);
-	} else
+	node = ofw_bus_get_node(dev);
+	if ((OF_getprop(node, "clock-frequency", &clock,
+	    sizeof(clock))) <= 0)
 		return (ENXIO);
 
 	if (clock == 0)