svn commit: r248044 - stable/9/sys/sparc64/pci

[Marius Strobl]

Author: marius
Date: Fri Mar  8 12:13:30 2013
New Revision: 248044
URL: http://svnweb.freebsd.org/changeset/base/248044

Log:
  MFC: r247574
  
  - In sbbc_pci_attach() just pass the already obtained bus tag and handle
    instead of acquiring these anew.
  - Use NULL instead of 0 for pointers.

Modified:
  stable/9/sys/sparc64/pci/sbbc.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/sparc64/pci/sbbc.c
==============================================================================
--- stable/9/sys/sparc64/pci/sbbc.c	Fri Mar  8 12:11:41 2013	(r248043)
+++ stable/9/sys/sparc64/pci/sbbc.c	Fri Mar  8 12:13:30 2013	(r248044)
@@ -299,7 +299,7 @@ static device_method_t sbbc_pci_methods[
 static devclass_t sbbc_devclass;
 
 DEFINE_CLASS_0(sbbc, sbbc_driver, sbbc_pci_methods, sizeof(struct sbbc_softc));
-DRIVER_MODULE(sbbc, pci, sbbc_driver, sbbc_devclass, 0, 0);
+DRIVER_MODULE(sbbc, pci, sbbc_driver, sbbc_devclass, NULL, NULL);
 
 static int
 sbbc_pci_probe(device_t dev)
@@ -358,8 +358,7 @@ sbbc_pci_attach(device_t dev)
 		if (error != 0)
 			device_printf(dev, "failed to attach UART device\n");
 	} else {
-		error = sbbc_parse_toc(rman_get_bustag(sc->sc_res),
-		    rman_get_bushandle(sc->sc_res));
+		error = sbbc_parse_toc(bst, bsh);
 		if (error != 0) {
 			device_printf(dev, "failed to parse TOC\n");
 			if (sbbc_console != 0) {
@@ -609,7 +608,7 @@ static device_method_t sbbc_uart_sbbc_me
 
 DEFINE_CLASS_0(uart, sbbc_uart_driver, sbbc_uart_sbbc_methods,
     sizeof(struct uart_softc));
-DRIVER_MODULE(uart, sbbc, sbbc_uart_driver, uart_devclass, 0, 0);
+DRIVER_MODULE(uart, sbbc, sbbc_uart_driver, uart_devclass, NULL, NULL);
 
 static int
 sbbc_uart_sbbc_probe(device_t dev)