Date: Fri, 6 May 2022 22:43:21 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8272dd4b0e1d - main - hpt*: Remove unused devclass arguments to DRIVER_MODULE. Message-ID: <202205062243.246MhLkK019580@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8272dd4b0e1d6cd362409d5c290afb4d7070fa8a commit 8272dd4b0e1d6cd362409d5c290afb4d7070fa8a Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-04-19 21:27:48 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:39:30 +0000 hpt*: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/hpt27xx/hpt27xx_osm_bsd.c | 6 ++---- sys/dev/hptiop/hptiop.c | 4 +--- sys/dev/hptmv/entry.c | 6 ++---- sys/dev/hptnr/hptnr_osm_bsd.c | 6 ++---- sys/dev/hptrr/hptrr_osm_bsd.c | 6 ++---- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c index 6defb2fa1399..68ff8c6f4d24 100644 --- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c +++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c @@ -1276,17 +1276,15 @@ static driver_t hpt_pci_driver = { sizeof(HBA) }; -static devclass_t hpt_devclass; - #ifndef TARGETNAME #error "no TARGETNAME found" #endif /* use this to make TARGETNAME be expanded */ -#define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6) +#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) #define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2) #define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5) -__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, hpt_devclass, 0, 0); +__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0); __MODULE_VERSION(TARGETNAME, 1); __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c index 9b25f59bc883..9ca9ec91a314 100644 --- a/sys/dev/hptiop/hptiop.c +++ b/sys/dev/hptiop/hptiop.c @@ -77,8 +77,6 @@ __FBSDID("$FreeBSD$"); static const char driver_name[] = "hptiop"; static const char driver_version[] = "v1.9"; -static devclass_t hptiop_devclass; - static int hptiop_send_sync_msg(struct hpt_iop_hba *hba, u_int32_t msg, u_int32_t millisec); static void hptiop_request_callback_itl(struct hpt_iop_hba *hba, @@ -1796,7 +1794,7 @@ static driver_t hptiop_pci_driver = { sizeof(struct hpt_iop_hba) }; -DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0); +DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, 0, 0); MODULE_DEPEND(hptiop, cam, 1, 1, 1); static int hptiop_probe(device_t dev) diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c index d1c6f8185f6c..8271328fd060 100644 --- a/sys/dev/hptmv/entry.c +++ b/sys/dev/hptmv/entry.c @@ -98,10 +98,8 @@ static driver_t hpt_pci_driver = { sizeof(IAL_ADAPTER_T) }; -static devclass_t hpt_devclass; - -#define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6) -__DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0); +#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) +__DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, 0, 0); MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1); #define ccb_ccb_ptr spriv_ptr0 diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c index 2fe5c43d8b09..848ec8c95f87 100644 --- a/sys/dev/hptnr/hptnr_osm_bsd.c +++ b/sys/dev/hptnr/hptnr_osm_bsd.c @@ -1559,17 +1559,15 @@ static driver_t hpt_pci_driver = { sizeof(HBA) }; -static devclass_t hpt_devclass; - #ifndef TARGETNAME #error "no TARGETNAME found" #endif /* use this to make TARGETNAME be expanded */ -#define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6) +#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) #define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2) #define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5) -__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, hpt_devclass, 0, 0); +__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0); __MODULE_VERSION(TARGETNAME, 1); __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c index 5dc9680e5cc8..198a6bca390b 100644 --- a/sys/dev/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/hptrr/hptrr_osm_bsd.c @@ -1206,17 +1206,15 @@ static driver_t hpt_pci_driver = { sizeof(HBA) }; -static devclass_t hpt_devclass; - #ifndef TARGETNAME #error "no TARGETNAME found" #endif /* use this to make TARGETNAME be expanded */ -#define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6) +#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) #define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2) #define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5) -__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, hpt_devclass, 0, 0); +__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0); __MODULE_VERSION(TARGETNAME, 1); __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205062243.246MhLkK019580>