Changeset View
Changeset View
Standalone View
Standalone View
sys/dev/acpica/acpi_smbat.c
Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines | |||||
DRIVER_MODULE(acpi_smbat, acpi, acpi_smbat_driver, acpi_smbat_devclass, 0, 0); | DRIVER_MODULE(acpi_smbat, acpi, acpi_smbat_driver, acpi_smbat_devclass, 0, 0); | ||||
MODULE_DEPEND(acpi_smbat, acpi, 1, 1, 1); | MODULE_DEPEND(acpi_smbat, acpi, 1, 1, 1); | ||||
static int | static int | ||||
acpi_smbat_probe(device_t dev) | acpi_smbat_probe(device_t dev) | ||||
{ | { | ||||
static char *smbat_ids[] = {"ACPI0001", "ACPI0005", NULL}; | static char *smbat_ids[] = {"ACPI0001", "ACPI0005", NULL}; | ||||
ACPI_STATUS status; | ACPI_STATUS status; | ||||
int rv; | |||||
if (acpi_disabled("smbat") || | if (acpi_disabled("smbat")) | ||||
ACPI_ID_PROBE(device_get_parent(dev), dev, smbat_ids) == NULL) | |||||
return (ENXIO); | return (ENXIO); | ||||
rv = ACPI_ID_PROBE(device_get_parent(dev), dev, smbat_ids, NULL); | |||||
if (rv > 0) | |||||
jhb: Space after 'if'. | |||||
return (rv); | |||||
Done Inline ActionsJust use 'return' directly instead of a goto. jhb: Just use 'return' directly instead of a goto. | |||||
Done Inline Actionsreturn (rv)? jhb: return (rv)? | |||||
status = AcpiEvaluateObject(acpi_get_handle(dev), "_EC", NULL, NULL); | status = AcpiEvaluateObject(acpi_get_handle(dev), "_EC", NULL, NULL); | ||||
if (ACPI_FAILURE(status)) | if (ACPI_FAILURE(status)) | ||||
return (ENXIO); | return (ENXIO); | ||||
device_set_desc(dev, "ACPI Smart Battery"); | device_set_desc(dev, "ACPI Smart Battery"); | ||||
return (0); | return (rv); | ||||
} | } | ||||
static int | static int | ||||
acpi_smbat_attach(device_t dev) | acpi_smbat_attach(device_t dev) | ||||
{ | { | ||||
struct acpi_smbat_softc *sc; | struct acpi_smbat_softc *sc; | ||||
uint32_t base; | uint32_t base; | ||||
▲ Show 20 Lines • Show All 363 Lines • Show Last 20 Lines |
Space after 'if'.