SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-10-08 04:15:41 +00:00
parent 06882d626f
commit 855cd93650
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
12 changed files with 71 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sys/dev/acpi/ufshci_acpi.c
View file

@ -1,4 +1,4 @@
/* $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>
*
@ -45,7 +45,8 @@ int ufshci_acpi_match(struct device *, void *, void *);
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[] = {

6
sys/dev/fdt/ufshci_fdt.c
View file

@ -1,4 +1,4 @@
/* $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>
*
@ -36,7 +36,9 @@ void ufshci_fdt_attach(struct device *, struct device *, void *);
const struct cfattach ufshci_fdt_ca = {
sizeof(struct ufshci_softc),
ufshci_fdt_match,
ufshci_fdt_attach
ufshci_fdt_attach,
NULL,
ufshci_activate
};
int

5
sys/dev/ic/ufshci.c
View file

@ -1,4 +1,4 @@
/* $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>
@ -1380,8 +1380,9 @@ ufshci_xfer_complete(struct ufshci_softc *sc)
}
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) {

4
sys/dev/ic/ufshcivar.h
View file

@ -1,4 +1,4 @@
/* $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>
@ -83,4 +83,4 @@ struct ufshci_softc {
int ufshci_intr(void *);
int ufshci_attach(struct ufshci_softc *);
int ufshci_activate(struct ufshci_softc *, int);
int ufshci_activate(struct device *, int);

13
sys/dev/pci/ufshci_pci.c
View file

@ -1,4 +1,4 @@
/* $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>
@ -41,14 +41,13 @@ struct ufshci_pci_softc {
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
@ -108,11 +107,3 @@ ufshci_pci_detach(struct device *self, int flags)
{
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);
}