hpt: remove unnecessary macro expansion hacks

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D54875
This commit is contained in:
Ahmad Khalifa
2026-01-26 11:28:08 +02:00
parent 6ecaa8dfb6
commit c29e05113c
4 changed files with 10 additions and 23 deletions
+3 -7
View File
@@ -1271,13 +1271,9 @@ static driver_t hpt_pci_driver = {
#error "no TARGETNAME found"
#endif
/* use this to make TARGETNAME be expanded */
#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, 0, 0);
__MODULE_VERSION(TARGETNAME, 1);
__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL);
MODULE_VERSION(TARGETNAME, 1);
MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
{
+1 -2
View File
@@ -95,8 +95,7 @@ static driver_t hpt_pci_driver = {
sizeof(IAL_ADAPTER_T)
};
#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);
DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, NULL, NULL);
MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
#define ccb_ccb_ptr spriv_ptr0
+3 -7
View File
@@ -1561,13 +1561,9 @@ static driver_t hpt_pci_driver = {
#error "no TARGETNAME found"
#endif
/* use this to make TARGETNAME be expanded */
#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, 0, 0);
__MODULE_VERSION(TARGETNAME, 1);
__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL);
MODULE_VERSION(TARGETNAME, 1);
MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
{
+3 -7
View File
@@ -1204,13 +1204,9 @@ static driver_t hpt_pci_driver = {
#error "no TARGETNAME found"
#endif
/* use this to make TARGETNAME be expanded */
#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, 0, 0);
__MODULE_VERSION(TARGETNAME, 1);
__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL);
MODULE_VERSION(TARGETNAME, 1);
MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
{