Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 3 Nov 2019 20:39:46 +0000 (UTC)
From:      Vladimir Kondratyev <wulf@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r354291 - in head/sys/dev: chromebook_platform ichiic
Message-ID:  <201911032039.xA3KdktH053170@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: wulf
Date: Sun Nov  3 20:39:46 2019
New Revision: 354291
URL: https://svnweb.freebsd.org/changeset/base/354291

Log:
  [ig4] Give common name to PCI and ACPI device drivers
  
  They share common device driver code with different bus attachments
  
  This commit starts a bunch of changes which have following properties:
  
  Reviewed by:		imp (previous version)
  MFC after:		1 month
  Differential Revision:	https://reviews.freebsd.org/D22016

Modified:
  head/sys/dev/chromebook_platform/chromebook_platform.c
  head/sys/dev/ichiic/ig4_acpi.c
  head/sys/dev/ichiic/ig4_iic.c
  head/sys/dev/ichiic/ig4_pci.c
  head/sys/dev/ichiic/ig4_var.h

Modified: head/sys/dev/chromebook_platform/chromebook_platform.c
==============================================================================
--- head/sys/dev/chromebook_platform/chromebook_platform.c	Sun Nov  3 19:36:34 2019	(r354290)
+++ head/sys/dev/chromebook_platform/chromebook_platform.c	Sun Nov  3 20:39:46 2019	(r354291)
@@ -69,7 +69,7 @@ chromebook_i2c_identify(driver_t *driver, device_t bus
 	 * See http://lxr.free-electrons.com/source/drivers/platform/chrome/chromeos_laptop.c
 	 */
 	controller = device_get_parent(bus);
-	if (strcmp(device_get_name(controller), "ig4iic_pci") != 0)
+	if (strcmp(device_get_name(controller), "ig4iic") != 0)
 		return;
 
 	for (i = 0; i < nitems(slaves); i++) {

Modified: head/sys/dev/ichiic/ig4_acpi.c
==============================================================================
--- head/sys/dev/ichiic/ig4_acpi.c	Sun Nov  3 19:36:34 2019	(r354290)
+++ head/sys/dev/ichiic/ig4_acpi.c	Sun Nov  3 20:39:46 2019	(r354291)
@@ -163,15 +163,10 @@ static device_method_t ig4iic_acpi_methods[] = {
 };
 
 static driver_t ig4iic_acpi_driver = {
-	"ig4iic_acpi",
+	"ig4iic",
 	ig4iic_acpi_methods,
 	sizeof(struct ig4iic_softc),
 };
 
-static devclass_t ig4iic_acpi_devclass;
-DRIVER_MODULE(ig4iic_acpi, acpi, ig4iic_acpi_driver, ig4iic_acpi_devclass, 0, 0);
-
-MODULE_DEPEND(ig4iic_acpi, acpi, 1, 1, 1);
-MODULE_DEPEND(ig4iic_acpi, pci, 1, 1, 1);
-MODULE_DEPEND(ig4iic_acpi, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
-MODULE_VERSION(ig4iic_acpi, 1);
+DRIVER_MODULE(ig4iic, acpi, ig4iic_acpi_driver, ig4iic_devclass, 0, 0);
+MODULE_DEPEND(ig4iic, acpi, 1, 1, 1);

Modified: head/sys/dev/ichiic/ig4_iic.c
==============================================================================
--- head/sys/dev/ichiic/ig4_iic.c	Sun Nov  3 19:36:34 2019	(r354290)
+++ head/sys/dev/ichiic/ig4_iic.c	Sun Nov  3 20:39:46 2019	(r354291)
@@ -797,5 +797,8 @@ ig4iic_dump(ig4iic_softc_t *sc)
 }
 #undef REGDUMP
 
-DRIVER_MODULE(iicbus, ig4iic_acpi, iicbus_driver, iicbus_devclass, NULL, NULL);
-DRIVER_MODULE(iicbus, ig4iic_pci, iicbus_driver, iicbus_devclass, NULL, NULL);
+devclass_t ig4iic_devclass;
+
+DRIVER_MODULE(iicbus, ig4iic, iicbus_driver, iicbus_devclass, NULL, NULL);
+MODULE_DEPEND(ig4iic, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
+MODULE_VERSION(ig4iic, 1);

Modified: head/sys/dev/ichiic/ig4_pci.c
==============================================================================
--- head/sys/dev/ichiic/ig4_pci.c	Sun Nov  3 19:36:34 2019	(r354290)
+++ head/sys/dev/ichiic/ig4_pci.c	Sun Nov  3 20:39:46 2019	(r354291)
@@ -220,17 +220,13 @@ static device_method_t ig4iic_pci_methods[] = {
 };
 
 static driver_t ig4iic_pci_driver = {
-	"ig4iic_pci",
+	"ig4iic",
 	ig4iic_pci_methods,
 	sizeof(struct ig4iic_softc)
 };
 
-static devclass_t ig4iic_pci_devclass;
-
-DRIVER_MODULE_ORDERED(ig4iic_pci, pci, ig4iic_pci_driver, ig4iic_pci_devclass, 0, 0,
+DRIVER_MODULE_ORDERED(ig4iic, pci, ig4iic_pci_driver, ig4iic_devclass, 0, 0,
     SI_ORDER_ANY);
-MODULE_DEPEND(ig4iic_pci, pci, 1, 1, 1);
-MODULE_DEPEND(ig4iic_pci, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER);
-MODULE_VERSION(ig4iic_pci, 1);
-MODULE_PNP_INFO("W32:vendor/device", pci, ig4iic_pci, ig4iic_pci_devices,
+MODULE_DEPEND(ig4iic, pci, 1, 1, 1);
+MODULE_PNP_INFO("W32:vendor/device", pci, ig4iic, ig4iic_pci_devices,
     nitems(ig4iic_pci_devices));

Modified: head/sys/dev/ichiic/ig4_var.h
==============================================================================
--- head/sys/dev/ichiic/ig4_var.h	Sun Nov  3 19:36:34 2019	(r354290)
+++ head/sys/dev/ichiic/ig4_var.h	Sun Nov  3 20:39:46 2019	(r354291)
@@ -101,6 +101,8 @@ struct ig4iic_softc {
 
 typedef struct ig4iic_softc ig4iic_softc_t;
 
+extern devclass_t ig4iic_devclass;
+
 /* Attach/Detach called from ig4iic_pci_*() */
 int ig4iic_attach(ig4iic_softc_t *sc);
 int ig4iic_detach(ig4iic_softc_t *sc);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911032039.xA3KdktH053170>