svn commit: r233877 - head/sys/dev/mfi
Jung-uk Kim
jkim at FreeBSD.org
Wed Apr 4 16:15:41 UTC 2012
Author: jkim
Date: Wed Apr 4 16:15:40 2012
New Revision: 233877
URL: http://svn.freebsd.org/changeset/base/233877
Log:
- Do not include machine/atomic.h. It is no longer necessary since r233768.
- Remove bogus "atomic" macros and a read-only variable from softc.
Reviewed by: ambrisko
Modified:
head/sys/dev/mfi/mfi_tbolt.c
head/sys/dev/mfi/mfivar.h
Modified: head/sys/dev/mfi/mfi_tbolt.c
==============================================================================
--- head/sys/dev/mfi/mfi_tbolt.c Wed Apr 4 14:51:04 2012 (r233876)
+++ head/sys/dev/mfi/mfi_tbolt.c Wed Apr 4 16:15:40 2012 (r233877)
@@ -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);
Modified: head/sys/dev/mfi/mfivar.h
==============================================================================
--- head/sys/dev/mfi/mfivar.h Wed Apr 4 14:51:04 2012 (r233876)
+++ head/sys/dev/mfi/mfivar.h Wed Apr 4 16:15:40 2012 (r233877)
@@ -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;
More information about the svn-src-all
mailing list