diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-04-04 16:15:40 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-04-04 16:15:40 +0000 |
| commit | 3df9a2bf07130c4676ba070ed1fa774db185abbd (patch) | |
| tree | 06904c6290165439db4b9699b12d70c4a8e16dad /sys/dev/mfi | |
| parent | 63dfd849a15aaedc170d04552f57f55d31bb9efb (diff) | |
Notes
Diffstat (limited to 'sys/dev/mfi')
| -rw-r--r-- | sys/dev/mfi/mfi_tbolt.c | 6 | ||||
| -rw-r--r-- | sys/dev/mfi/mfivar.h | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/sys/dev/mfi/mfi_tbolt.c b/sys/dev/mfi/mfi_tbolt.c index c4a6fe2d0c2a..d63d0d3a013f 100644 --- a/sys/dev/mfi/mfi_tbolt.c +++ b/sys/dev/mfi/mfi_tbolt.c @@ -520,12 +520,6 @@ int mfi_tbolt_reset(struct mfi_softc *sc) uint32_t fw_state; mtx_lock(&sc->mfi_io_lock); - if (mfi_atomic_read(&sc->fw_reset_no_pci_access)) { - device_printf(sc->mfi_dev, "NO PCI ACCESS\n"); - mtx_unlock(&sc->mfi_io_lock); - return 1; - } - if (sc->hw_crit_error) { device_printf(sc->mfi_dev, "HW CRITICAL ERROR\n"); mtx_unlock(&sc->mfi_io_lock); diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h index 858f498a00d3..7afbc889ab66 100644 --- a/sys/dev/mfi/mfivar.h +++ b/sys/dev/mfi/mfivar.h @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/taskqueue.h> -#include <machine/atomic.h> /* * SCSI structures and definitions are used from here, but no linking @@ -162,12 +161,6 @@ struct megasas_sge }; struct mfi_cmd_tbolt; -struct mfi_atomic { - volatile unsigned int val; -}; - -#define mfi_atomic_read(v) ((v)->val) -#define mfi_atomic_set(v,i) ((v)->val - (i)) struct mfi_softc { device_t mfi_dev; @@ -246,7 +239,6 @@ struct mfi_softc { struct intr_config_hook mfi_ich; eventhandler_tag eh; /* OCR flags */ - struct mfi_atomic fw_reset_no_pci_access; uint8_t adpreset; uint8_t issuepend_done; uint8_t disableOnlineCtrlReset; |