8efc2b3f05
Remove unused and easy to misuse PNP macro parameter
Inspired by r338025, just remove the element size parameter to the
MODULE_PNP_INFO macro entirely. The 'table' parameter is now required to
have correct pointer (or array) type. Since all invocations of the macro
already had this property and the emitted PNP data continues to include the
element size, there is no functional change.
Mostly done with the coccinelle 'spatch' tool:
$ cat modpnpsize0.cocci
@normaltables@
identifier b,c;
expression a,d,e;
declarer MODULE_PNP_INFO;
@@
MODULE_PNP_INFO(a,b,c,d,
-sizeof(d[0]),
e);
@singletons@
identifier b,c,d;
expression a;
declarer MODULE_PNP_INFO;
@@
MODULE_PNP_INFO(a,b,c,&d,
-sizeof(d),
1);
$ rg -l MODULE_PNP_INFO -- sys | \
xargs spatch --in-place --sp-file modpnpsize0.cocci
(Note that coccinelle invokes diff(1) via a PATH search and expects diff to
tolerate the -B flag, which BSD diff does not. So I had to link gdiff into
PATH as diff to use spatch.)
Tinderbox'd (-DMAKE_JUST_KERNELS).
Approved by: re (glen)
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (c) 2001 M. Warner Losh. All rights reserved.
|
|
* Copyright (c) 2003 Norikatsu Shigemura, Takenori Watanabe All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/bus.h>
|
|
#include <sys/conf.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/module.h>
|
|
#include <machine/bus.h>
|
|
#include <machine/resource.h>
|
|
|
|
#include <dev/pccard/pccard_cis.h>
|
|
#include <dev/pccard/pccardvar.h>
|
|
|
|
#include <dev/uart/uart.h>
|
|
#include <dev/uart/uart_bus.h>
|
|
|
|
#include "pccarddevs.h"
|
|
|
|
static int uart_pccard_probe(device_t dev);
|
|
static int uart_pccard_attach(device_t dev);
|
|
|
|
static device_method_t uart_pccard_methods[] = {
|
|
/* Device interface */
|
|
DEVMETHOD(device_probe, uart_pccard_probe),
|
|
DEVMETHOD(device_attach, uart_pccard_attach),
|
|
DEVMETHOD(device_detach, uart_bus_detach),
|
|
|
|
{ 0, 0 }
|
|
};
|
|
|
|
static uint32_t uart_pccard_function = PCCARD_FUNCTION_SERIAL;
|
|
|
|
static driver_t uart_pccard_driver = {
|
|
uart_driver_name,
|
|
uart_pccard_methods,
|
|
sizeof(struct uart_softc),
|
|
};
|
|
|
|
static int
|
|
uart_pccard_probe(device_t dev)
|
|
{
|
|
int error;
|
|
uint32_t fcn;
|
|
|
|
fcn = PCCARD_FUNCTION_UNSPEC;
|
|
error = pccard_get_function(dev, &fcn);
|
|
if (error != 0)
|
|
return (error);
|
|
/*
|
|
* If a serial card, we are likely the right driver. However,
|
|
* some serial cards are better serviced by other drivers, so
|
|
* allow other drivers to claim it, if they want.
|
|
*/
|
|
if (fcn == uart_pccard_function)
|
|
return (BUS_PROBE_GENERIC);
|
|
|
|
return (ENXIO);
|
|
}
|
|
|
|
static int
|
|
uart_pccard_attach(device_t dev)
|
|
{
|
|
struct uart_softc *sc;
|
|
int error;
|
|
|
|
sc = device_get_softc(dev);
|
|
sc->sc_class = &uart_ns8250_class;
|
|
|
|
error = uart_bus_probe(dev, 0, 0, 0, 0, 0, 0);
|
|
if (error > 0)
|
|
return (error);
|
|
return (uart_bus_attach(dev));
|
|
}
|
|
|
|
DRIVER_MODULE(uart, pccard, uart_pccard_driver, uart_devclass, 0, 0);
|
|
MODULE_PNP_INFO("U32:function_type;", pccard, uart, &uart_pccard_function,
|
|
1);
|