Mercurial > illumos > illumos-gate
changeset 13083:ec9d94ce123b
6970318 warlock warnings should be fixed
| author | Mark Logan <Mark.Logan@Sun.COM> |
|---|---|
| date | Wed, 11 Aug 2010 11:18:58 -0700 |
| parents | 87f89233b883 |
| children | 8edea3c8c280 |
| files | usr/src/uts/common/io/sata/adapters/si3124/si3124.c usr/src/uts/common/io/warlock/si3124.wlcmd usr/src/uts/common/sys/sata/adapters/si3124/si3124var.h |
| diffstat | 3 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/sata/adapters/si3124/si3124.c Wed Aug 11 12:52:19 2010 -0400 +++ b/usr/src/uts/common/io/sata/adapters/si3124/si3124.c Wed Aug 11 11:18:58 2010 -0700 @@ -3827,10 +3827,9 @@ } args->siea_ctlp = si_ctlp; - args->siea_portp = si_portp; args->siea_port = port; - (void) timeout(si_do_intr_command_error, args, 1); + (void) timeout(si_do_intr_command_error, si_portp, 1); mutex_exit(&si_portp->siport_mutex); } @@ -3847,13 +3846,14 @@ si_port_state_t *si_portp; int port; - args = arg; + si_portp = arg; + mutex_enter(&si_portp->siport_mutex); + + args = si_portp->siport_event_args; si_ctlp = args->siea_ctlp; - si_portp = args->siea_portp; port = args->siea_port; - - mutex_enter(&si_portp->siport_mutex); args->siea_ctlp = NULL; /* mark siport_event_args as free */ + mutex_exit(&si_portp->siport_mutex); (void) si_intr_command_error(si_ctlp, si_portp, port); } @@ -5407,10 +5407,9 @@ } args->siea_ctlp = si_ctlp; - args->siea_portp = si_portp; args->siea_port = port; - (void) timeout(si_do_initialize_port, args, 1); + (void) timeout(si_do_initialize_port, si_portp, 1); } /* @@ -5425,14 +5424,15 @@ si_port_state_t *si_portp; int port; - args = arg; - si_portp = args->siea_portp; + si_portp = arg; + mutex_enter(&si_portp->siport_mutex); + + args = si_portp->siport_event_args; si_ctlp = args->siea_ctlp; port = args->siea_port; - - mutex_enter(&si_portp->siport_mutex); args->siea_ctlp = NULL; /* mark siport_event_args as free */ (void) si_initialize_port_wait_till_ready(si_ctlp, port); + mutex_exit(&si_portp->siport_mutex); }
--- a/usr/src/uts/common/io/warlock/si3124.wlcmd Wed Aug 11 12:52:19 2010 -0400 +++ b/usr/src/uts/common/io/warlock/si3124.wlcmd Wed Aug 11 11:18:58 2010 -0700 @@ -100,6 +100,7 @@ sd.c:sd_media_watch_cb root si_fm_error_cb +root si_quiesce add scsi_pkt::pkt_comp targets \ scsi_watch.c:scsi_watch_request_intr \
--- a/usr/src/uts/common/sys/sata/adapters/si3124/si3124var.h Wed Aug 11 12:52:19 2010 -0400 +++ b/usr/src/uts/common/sys/sata/adapters/si3124/si3124var.h Wed Aug 11 11:18:58 2010 -0700 @@ -68,7 +68,6 @@ /* Argument to be used for calls to timeout() */ typedef struct si_event_arg { void *siea_ctlp; - void *siea_portp; int siea_port; } si_event_arg_t;