diff options
| author | mjacob <mjacob@FreeBSD.org> | 2007-03-22 23:38:32 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2007-03-22 23:38:32 +0000 |
| commit | 6f755d6db148e306ad33a22315a01a7517244356 (patch) | |
| tree | 85e12f0631429fadf68036c6a1b21a0a6b2c464d /sys/dev/isp/isp_pci.c | |
| parent | 19daed61a74611f0a0af9192abefe321ed79499c (diff) | |
| download | FreeBSD-src-6f755d6db148e306ad33a22315a01a7517244356.zip FreeBSD-src-6f755d6db148e306ad33a22315a01a7517244356.tar.gz | |
MFP4: a) Some constification from NetBSD (gcc 4.1.2)
b) Split default param fetching/setting into scsi and fibre functions
and retry the fibre fetch more than once.
MFC after: 1 week
Diffstat (limited to 'sys/dev/isp/isp_pci.c')
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index a5e4a4f..7b5a326 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -1053,12 +1053,7 @@ isp_pci_attach(device_t dev) isp->isp_osinfo.fw = firmware_get(fwname); } if (isp->isp_osinfo.fw != NULL) { - union { - const void *fred; - uint16_t *bob; - } u; - u.fred = isp->isp_osinfo.fw->data; - isp->isp_mdvec->dv_ispfw = u.bob; + isp->isp_mdvec->dv_ispfw = isp->isp_osinfo.fw->data; } } #else |
