-/* $OpenBSD: ufshci_acpi.c,v 1.2 2024/01/06 17:47:43 mglocker Exp $ */
+/* $OpenBSD: ufshci_acpi.c,v 1.3 2024/10/08 00:46:29 jsg Exp $ */
/*
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
*
void ufshci_acpi_attach(struct device *, struct device *, void *);
const struct cfattach ufshci_acpi_ca = {
- sizeof(struct ufshci_acpi_softc), ufshci_acpi_match, ufshci_acpi_attach
+ sizeof(struct ufshci_acpi_softc), ufshci_acpi_match, ufshci_acpi_attach,
+ NULL, ufshci_activate
};
const char *ufshci_hids[] = {
-/* $OpenBSD: ufshci_fdt.c,v 1.1 2024/07/31 10:07:33 mglocker Exp $ */
+/* $OpenBSD: ufshci_fdt.c,v 1.2 2024/10/08 00:46:29 jsg Exp $ */
/*
* Copyright (c) 2024 Marcus Glocker <mglocker@openbsd.org>
*
const struct cfattach ufshci_fdt_ca = {
sizeof(struct ufshci_softc),
ufshci_fdt_match,
- ufshci_fdt_attach
+ ufshci_fdt_attach,
+ NULL,
+ ufshci_activate
};
int
-/* $OpenBSD: ufshci.c,v 1.41 2024/08/30 18:22:41 mglocker Exp $ */
+/* $OpenBSD: ufshci.c,v 1.42 2024/10/08 00:46:29 jsg Exp $ */
/*
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
}
int
-ufshci_activate(struct ufshci_softc *sc, int act)
+ufshci_activate(struct device *self, int act)
{
+ struct ufshci_softc *sc = (struct ufshci_softc *)self;
int rv = 0;
switch (act) {
-/* $OpenBSD: ufshcivar.h,v 1.9 2024/05/29 00:48:15 jsg Exp $ */
+/* $OpenBSD: ufshcivar.h,v 1.10 2024/10/08 00:46:29 jsg Exp $ */
/*
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
int ufshci_intr(void *);
int ufshci_attach(struct ufshci_softc *);
-int ufshci_activate(struct ufshci_softc *, int);
+int ufshci_activate(struct device *, int);
-/* $OpenBSD: ufshci_pci.c,v 1.4 2024/05/24 09:51:13 mglocker Exp $ */
+/* $OpenBSD: ufshci_pci.c,v 1.5 2024/10/08 00:46:29 jsg Exp $ */
/*
* Copyright (c) 2024 Marcus Glocker <mglocker@openbsd.org>
int ufshci_pci_match(struct device *, void *, void *);
void ufshci_pci_attach(struct device *, struct device *, void *);
int ufshci_pci_detach(struct device *, int);
-int ufshci_pci_activate(struct device *, int);
const struct cfattach ufshci_pci_ca = {
sizeof(struct ufshci_pci_softc),
ufshci_pci_match,
ufshci_pci_attach,
ufshci_pci_detach,
- ufshci_pci_activate
+ ufshci_activate
};
int
{
return 0;
}
-
-int
-ufshci_pci_activate(struct device *self, int act)
-{
- struct ufshci_pci_softc *psc = (struct ufshci_pci_softc *)self;
-
- return ufshci_activate(&psc->psc_ufshci, act);
-}