From: Jonathan Gray <jsg@jsg.id.au>
Subject: set activate for ufshci_acpi and ufshci_fdt
To: tech@openbsd.org
Date: Sun, 6 Oct 2024 16:42:28 +1100

change ufshci_activate argument to avoid extra functions
in attachments

ufshci_softc is first in attachment softcs

Index: dev/ic/ufshci.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/ufshci.c,v
diff -u -p -r1.41 ufshci.c
--- dev/ic/ufshci.c	30 Aug 2024 18:22:41 -0000	1.41
+++ dev/ic/ufshci.c	6 Oct 2024 05:26:25 -0000
@@ -1380,8 +1380,9 @@ ufshci_xfer_complete(struct ufshci_softc
 }
 
 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) {
Index: dev/ic/ufshcivar.h
===================================================================
RCS file: /cvs/src/sys/dev/ic/ufshcivar.h,v
diff -u -p -r1.9 ufshcivar.h
--- dev/ic/ufshcivar.h	29 May 2024 00:48:15 -0000	1.9
+++ dev/ic/ufshcivar.h	6 Oct 2024 05:26:44 -0000
@@ -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);
Index: dev/acpi/ufshci_acpi.c
===================================================================
RCS file: /cvs/src/sys/dev/acpi/ufshci_acpi.c,v
diff -u -p -r1.2 ufshci_acpi.c
--- dev/acpi/ufshci_acpi.c	6 Jan 2024 17:47:43 -0000	1.2
+++ dev/acpi/ufshci_acpi.c	6 Oct 2024 05:27:51 -0000
@@ -45,7 +45,8 @@ int	ufshci_acpi_match(struct device *, v
 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[] = {
Index: dev/fdt/ufshci_fdt.c
===================================================================
RCS file: /cvs/src/sys/dev/fdt/ufshci_fdt.c,v
diff -u -p -r1.1 ufshci_fdt.c
--- dev/fdt/ufshci_fdt.c	31 Jul 2024 10:07:33 -0000	1.1
+++ dev/fdt/ufshci_fdt.c	6 Oct 2024 05:32:43 -0000
@@ -36,7 +36,9 @@ void	ufshci_fdt_attach(struct device *, 
 const struct cfattach ufshci_fdt_ca = {
 	sizeof(struct ufshci_softc),
 	ufshci_fdt_match,
-	ufshci_fdt_attach
+	ufshci_fdt_attach,
+	NULL,
+	ufshci_activate
 };
 
 int
Index: dev/pci/ufshci_pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/ufshci_pci.c,v
diff -u -p -r1.4 ufshci_pci.c
--- dev/pci/ufshci_pci.c	24 May 2024 09:51:13 -0000	1.4
+++ dev/pci/ufshci_pci.c	6 Oct 2024 05:29:03 -0000
@@ -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
@@ -107,12 +106,4 @@ int
 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);
 }