From 98602c008f34fcf6474eea1a368fd68f9c7ac07f Mon Sep 17 00:00:00 2001 From: marius Date: Sat, 2 Mar 2013 17:36:31 +0000 Subject: [PATCH] MFC: r246300 - Make pci_ns8250_ids[] const. - Use DEVMETHOD_END. - Use NULL instead of 0 for pointers. git-svn-id: svn://svn.freebsd.org/base/stable/8@247655 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/uart/uart_bus_pci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index e6b7912ee..cf25c4c84 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -51,7 +51,7 @@ static device_method_t uart_pci_methods[] = { DEVMETHOD(device_probe, uart_pci_probe), DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uart_pci_driver = { @@ -70,7 +70,7 @@ struct pci_id { int rclk; }; -static struct pci_id pci_ns8250_ids[] = { +static const struct pci_id pci_ns8250_ids[] = { { 0x1028, 0x0008, 0xffff, 0, "Dell Remote Access Card III", 0x14, 128 * DEFAULT_RCLK }, { 0x1028, 0x0012, 0xffff, 0, "Dell RAC 4 Daughter Card Virtual UART", 0x14, @@ -129,8 +129,8 @@ static struct pci_id pci_ns8250_ids[] = { { 0xffff, 0, 0xffff, 0, NULL, 0, 0} }; -static struct pci_id * -uart_pci_match(device_t dev, struct pci_id *id) +const static struct pci_id * +uart_pci_match(device_t dev, const struct pci_id *id) { uint16_t device, subdev, subven, vendor; @@ -155,7 +155,7 @@ static int uart_pci_probe(device_t dev) { struct uart_softc *sc; - struct pci_id *id; + const struct pci_id *id; sc = device_get_softc(dev); @@ -173,4 +173,4 @@ uart_pci_probe(device_t dev) return (uart_bus_probe(dev, 0, id->rclk, id->rid, 0)); } -DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, NULL, NULL); -- 2.45.0