Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 28 Dec 2014 20:42:29 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r276344 - head/sys/dev/ahci
Message-ID:  <201412282042.sBSKgTmX067586@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marius
Date: Sun Dec 28 20:42:28 2014
New Revision: 276344
URL: https://svnweb.freebsd.org/changeset/base/276344

Log:
  - Const'ify the ahci_ids table.
  - Use DEVMETHOD_END.
  - Use NULL instead of 0 for pointers.
  
  MFC after:	3 days

Modified:
  head/sys/dev/ahci/ahci.c
  head/sys/dev/ahci/ahci_pci.c
  head/sys/dev/ahci/ahciem.c

Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c	Sun Dec 28 20:02:06 2014	(r276343)
+++ head/sys/dev/ahci/ahci.c	Sun Dec 28 20:42:28 2014	(r276344)
@@ -868,14 +868,14 @@ static device_method_t ahcich_methods[] 
 	DEVMETHOD(device_detach,    ahci_ch_detach),
 	DEVMETHOD(device_suspend,   ahci_ch_suspend),
 	DEVMETHOD(device_resume,    ahci_ch_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t ahcich_driver = {
         "ahcich",
         ahcich_methods,
         sizeof(struct ahci_channel)
 };
-DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahcich_devclass, 0, 0);
+DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahcich_devclass, NULL, NULL);
 
 struct ahci_dc_cb_args {
 	bus_addr_t maddr;

Modified: head/sys/dev/ahci/ahci_pci.c
==============================================================================
--- head/sys/dev/ahci/ahci_pci.c	Sun Dec 28 20:02:06 2014	(r276343)
+++ head/sys/dev/ahci/ahci_pci.c	Sun Dec 28 20:42:28 2014	(r276344)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 static int force_ahci = 1;
 TUNABLE_INT("hw.ahci.force", &force_ahci);
 
-static struct {
+static const struct {
 	uint32_t	id;
 	uint8_t		rev;
 	const char	*name;
@@ -479,14 +479,14 @@ static device_method_t ahci_methods[] = 
 	DEVMETHOD(bus_teardown_intr,ahci_teardown_intr),
 	DEVMETHOD(bus_child_location_str, ahci_child_location_str),
 	DEVMETHOD(bus_get_dma_tag,  ahci_get_dma_tag),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t ahci_driver = {
         "ahci",
         ahci_methods,
         sizeof(struct ahci_controller)
 };
-DRIVER_MODULE(ahci, pci, ahci_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(ahci, pci, ahci_driver, ahci_devclass, NULL, NULL);
 static device_method_t ahci_ata_methods[] = {
 	DEVMETHOD(device_probe,     ahci_ata_probe),
 	DEVMETHOD(device_attach,    ahci_pci_attach),
@@ -499,11 +499,11 @@ static device_method_t ahci_ata_methods[
 	DEVMETHOD(bus_setup_intr,   ahci_setup_intr),
 	DEVMETHOD(bus_teardown_intr,ahci_teardown_intr),
 	DEVMETHOD(bus_child_location_str, ahci_child_location_str),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t ahci_ata_driver = {
         "ahci",
         ahci_ata_methods,
         sizeof(struct ahci_controller)
 };
-DRIVER_MODULE(ahci, atapci, ahci_ata_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(ahci, atapci, ahci_ata_driver, ahci_devclass, NULL, NULL);

Modified: head/sys/dev/ahci/ahciem.c
==============================================================================
--- head/sys/dev/ahci/ahciem.c	Sun Dec 28 20:02:06 2014	(r276343)
+++ head/sys/dev/ahci/ahciem.c	Sun Dec 28 20:42:28 2014	(r276344)
@@ -273,14 +273,14 @@ static device_method_t ahciem_methods[] 
 	DEVMETHOD(device_detach,    ahci_em_detach),
 	DEVMETHOD(device_suspend,   ahci_em_suspend),
 	DEVMETHOD(device_resume,    ahci_em_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t ahciem_driver = {
         "ahciem",
         ahciem_methods,
         sizeof(struct ahci_enclosure)
 };
-DRIVER_MODULE(ahciem, ahci, ahciem_driver, ahciem_devclass, 0, 0);
+DRIVER_MODULE(ahciem, ahci, ahciem_driver, ahciem_devclass, NULL, NULL);
 
 static void
 ahci_em_setleds(device_t dev, int c)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412282042.sBSKgTmX067586>