diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-08-22 16:17:01 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-08-22 16:17:01 +0000 |
| commit | 85cdc4047a46471a7b4901e113479d36b1154e01 (patch) | |
| tree | 94164360ee0eaa894c6ef185f52733e90a6aea72 /sys | |
| parent | 93acfa39f41d9afc6e82bf69ccc56294d8313b33 (diff) | |
remove last remnants of mpii_[e]cfg_header and mpii_[e]cfg_page
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/mpii.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index ba8fb4cb5ce..8aa728c9251 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.58 2012/08/22 16:07:42 mikeb Exp $ */ +/* $OpenBSD: mpii.c,v 1.59 2012/08/22 16:17:00 mikeb Exp $ */ /* * Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru> * Copyright (c) 2009 James Giannoules @@ -410,20 +410,6 @@ void mpii_refresh_sensors(void *); #define MPII_PG_POLL (1<<1) #define MPII_PG_FMT "\020" "\002POLL" "\001EXTENDED" -#define mpii_cfg_header(_s, _t, _n, _a, _h) \ - mpii_req_cfg_header((_s), (_t), (_n), (_a), \ - MPII_PG_POLL, (_h)) -#define mpii_ecfg_header(_s, _t, _n, _a, _h) \ - mpii_req_cfg_header((_s), (_t), (_n), (_a), \ - MPII_PG_POLL|MPII_PG_EXTENDED, (_h)) - -#define mpii_cfg_page(_s, _a, _h, _r, _p, _l) \ - mpii_req_cfg_page((_s), (_a), MPII_PG_POLL, \ - (_h), (_r), (_p), (_l)) -#define mpii_ecfg_page(_s, _a, _h, _r, _p, _l) \ - mpii_req_cfg_page((_s), (_a), MPII_PG_POLL|MPII_PG_EXTENDED, \ - (_h), (_r), (_p), (_l)) - static const struct pci_matchid mpii_devices[] = { { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2004 }, { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_SAS2008 }, @@ -3501,8 +3487,8 @@ mpii_bio_volstate(struct mpii_softc *sc, struct bioc_vol *bv) return (ENODEV); volh = dev->dev_handle; - if (mpii_cfg_header(sc, MPII_CONFIG_REQ_PAGE_TYPE_RAID_VOL, 0, - MPII_CFG_RAID_VOL_ADDR_HANDLE | volh, &hdr) != 0) { + if (mpii_req_cfg_header(sc, MPII_CONFIG_REQ_PAGE_TYPE_RAID_VOL, 0, + MPII_CFG_RAID_VOL_ADDR_HANDLE | volh, MPII_PG_POLL, &hdr) != 0) { DNPRINTF(MPII_D_MISC, "%s: unable to fetch header for raid " "volume page 0\n", DEVNAME(sc)); return (EINVAL); @@ -3516,8 +3502,8 @@ mpii_bio_volstate(struct mpii_softc *sc, struct bioc_vol *bv) return (ENOMEM); } - if (mpii_cfg_page(sc, MPII_CFG_RAID_VOL_ADDR_HANDLE | volh, - &hdr, 1, vpg, pagelen) != 0) { + if (mpii_req_cfg_page(sc, MPII_CFG_RAID_VOL_ADDR_HANDLE | volh, + MPII_PG_POLL, &hdr, 1, vpg, pagelen) != 0) { DNPRINTF(MPII_D_MISC, "%s: unable to fetch raid volume " "page 0\n", DEVNAME(sc)); free(vpg, M_TEMP); |