From owner-svn-src-head@freebsd.org  Tue Dec 13 09:53:45 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2191FC703B3;
 Tue, 13 Dec 2016 09:53:45 +0000 (UTC)
 (envelope-from mizhka@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E3C091D9E;
 Tue, 13 Dec 2016 09:53:44 +0000 (UTC)
 (envelope-from mizhka@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBD9riiB045570;
 Tue, 13 Dec 2016 09:53:44 GMT (envelope-from mizhka@FreeBSD.org)
Received: (from mizhka@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBD9rhAR045568;
 Tue, 13 Dec 2016 09:53:43 GMT (envelope-from mizhka@FreeBSD.org)
Message-Id: <201612130953.uBD9rhAR045568@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mizhka set sender to
 mizhka@FreeBSD.org using -f
From: Michael Zhilin <mizhka@FreeBSD.org>
Date: Tue, 13 Dec 2016 09:53:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310017 - in head/sys: dev/spibus mips/atheros/ar531x
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Dec 2016 09:53:45 -0000

Author: mizhka
Date: Tue Dec 13 09:53:43 2016
New Revision: 310017
URL: https://svnweb.freebsd.org/changeset/base/310017

Log:
  [spi] reformat message and ar5315_spi minor fix
  
  This commit corrects print of nomatch (newline was too early) and fix
  unit number for new child in ar5315_spi (was 0, now is -1 to calculate it
  according to actual system state)
  
  Submitted by:	Hiroki Mori <yamori813@yahoo.co.jp>
  Reviewed by:	ray, loos, mizhka
  MFC after:	2 weeks
  Differential Revision:	https://reviews.freebsd.org/D8749

Modified:
  head/sys/dev/spibus/spibus.c
  head/sys/mips/atheros/ar531x/ar5315_spi.c

Modified: head/sys/dev/spibus/spibus.c
==============================================================================
--- head/sys/dev/spibus/spibus.c	Tue Dec 13 09:43:49 2016	(r310016)
+++ head/sys/dev/spibus/spibus.c	Tue Dec 13 09:53:43 2016	(r310017)
@@ -117,8 +117,8 @@ spibus_probe_nomatch(device_t bus, devic
 	struct spibus_ivar *devi = SPIBUS_IVAR(child);
 
 	device_printf(bus, "<unknown card>");
-	printf(" at cs %d\n", devi->cs);
-	printf(" mode %d", devi->mode);
+	printf(" at cs %d", devi->cs);
+	printf(" mode %d\n", devi->mode);
 	return;
 }
 

Modified: head/sys/mips/atheros/ar531x/ar5315_spi.c
==============================================================================
--- head/sys/mips/atheros/ar531x/ar5315_spi.c	Tue Dec 13 09:43:49 2016	(r310016)
+++ head/sys/mips/atheros/ar531x/ar5315_spi.c	Tue Dec 13 09:53:43 2016	(r310017)
@@ -122,7 +122,7 @@ ar5315_spi_attach(device_t dev)
 		return (ENXIO);
 	}
 
-	device_add_child(dev, "spibus", 0);
+	device_add_child(dev, "spibus", -1);
 	ar5315_spi_attach_sysctl(dev);
 
 	return (bus_generic_attach(dev));