d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Do not include machine/atomic.h. It is no longer necessary since r233768.

Browse Source 
- Remove bogus "atomic" macros and a read-only variable from softc.

Reviewed by:	ambrisko
This commit is contained in:
Jung-uk Kim 2012-04-04 16:15:40 +00:00
parent 63dfd849a1
commit 3df9a2bf07
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/mfi/mfi_tbolt.c
View File

@ -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);

8
sys/dev/mfi/mfivar.h
View File

@ -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;