diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-19 23:41:56 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-03-15 09:21:30 +0200 |
| commit | b4a8b33babbf9a7a5de61ea06d09e1eb537f1f6e (patch) | |
| tree | 73c72bfaae99b9fac7309c33c1a85d38040508d0 /usr/src | |
| parent | a00b240dc61ea7ab64e3881b755fca973a531e89 (diff) | |
| download | illumos-joyent-b4a8b33babbf9a7a5de61ea06d09e1eb537f1f6e.tar.gz | |
10483 aac: cast between incompatible function types
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/aac/aac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/aac/aac.c b/usr/src/uts/common/io/aac/aac.c index 36c48d96e6..f9d3672963 100644 --- a/usr/src/uts/common/io/aac/aac.c +++ b/usr/src/uts/common/io/aac/aac.c @@ -255,8 +255,8 @@ static int aac_add_intrs(struct aac_softstate *); static void aac_remove_intrs(struct aac_softstate *); static int aac_enable_intrs(struct aac_softstate *); static int aac_disable_intrs(struct aac_softstate *); -static uint_t aac_intr_old(caddr_t); -static uint_t aac_intr_new(caddr_t); +static uint_t aac_intr_old(caddr_t, caddr_t); +static uint_t aac_intr_new(caddr_t, caddr_t); static uint_t aac_softintr(caddr_t); /* @@ -1416,7 +1416,7 @@ aac_process_intr_new(struct aac_softstate *softs) } static uint_t -aac_intr_new(caddr_t arg) +aac_intr_new(caddr_t arg, caddr_t arg1 __unused) { struct aac_softstate *softs = (void *)arg; uint_t rval; @@ -1555,7 +1555,7 @@ aac_process_intr_old(struct aac_softstate *softs) } static uint_t -aac_intr_old(caddr_t arg) +aac_intr_old(caddr_t arg, caddr_t arg1 __unused) { struct aac_softstate *softs = (void *)arg; int rval; @@ -1674,7 +1674,7 @@ aac_add_intrs(struct aac_softstate *softs) ddi_intr_handler_t *aac_intr; actual = softs->intr_cnt; - aac_intr = (ddi_intr_handler_t *)((softs->flags & AAC_FLAGS_NEW_COMM) ? + aac_intr = ((softs->flags & AAC_FLAGS_NEW_COMM) ? aac_intr_new : aac_intr_old); /* Call ddi_intr_add_handler() */ |