From e076c50a5750443bdca38781d9f889a998e6eeb9 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 17 Sep 2012 14:22:02 +0200 Subject: [PATCH] kernel: Remove some unused variables. --- sys/dev/disk/aic7xxx/aic79xx_pci.c | 3 --- sys/dev/drm/i915/i915_irq.c | 8 ++------ sys/netproto/802_11/wlan/ieee80211_mesh.c | 2 -- sys/netproto/802_11/wlan/ieee80211_sta.c | 6 ------ sys/platform/pc64/x86_64/pmap.c | 11 ----------- 5 files changed, 2 insertions(+), 28 deletions(-) diff --git a/sys/dev/disk/aic7xxx/aic79xx_pci.c b/sys/dev/disk/aic7xxx/aic79xx_pci.c index e9e7f06..5f798f0 100644 --- a/sys/dev/disk/aic7xxx/aic79xx_pci.c +++ b/sys/dev/disk/aic7xxx/aic79xx_pci.c @@ -41,7 +41,6 @@ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#88 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.24 2005/12/04 02:12:40 ru Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_pci.c,v 1.16 2008/02/09 18:13:13 pavalos Exp $ */ #ifdef __linux__ @@ -314,14 +313,12 @@ ahd_find_pci_device(aic_dev_softc_t pci) int ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_identity *entry) { - struct scb_data *shared_scb_data; u_int command; uint32_t devconfig; uint16_t device; uint16_t subvendor; int error; - shared_scb_data = NULL; ahd->description = entry->name; /* * Record if this is a HostRAID board. diff --git a/sys/dev/drm/i915/i915_irq.c b/sys/dev/drm/i915/i915_irq.c index 7ba4187..5e8ac11 100644 --- a/sys/dev/drm/i915/i915_irq.c +++ b/sys/dev/drm/i915/i915_irq.c @@ -188,18 +188,14 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) u32 iir, new_iir; u32 pipea_stats, pipeb_stats; u32 vblank_status; - u32 vblank_enable; int irq_received; iir = I915_READ(IIR); - if (IS_I965G(dev)) { + if (IS_I965G(dev)) vblank_status = PIPE_START_VBLANK_INTERRUPT_STATUS; - vblank_enable = PIPE_START_VBLANK_INTERRUPT_ENABLE; - } else { + else vblank_status = I915_VBLANK_INTERRUPT_STATUS; - vblank_enable = I915_VBLANK_INTERRUPT_ENABLE; - } for (;;) { irq_received = iir != 0; diff --git a/sys/netproto/802_11/wlan/ieee80211_mesh.c b/sys/netproto/802_11/wlan/ieee80211_mesh.c index 9f4865e..725cac2 100644 --- a/sys/netproto/802_11/wlan/ieee80211_mesh.c +++ b/sys/netproto/802_11/wlan/ieee80211_mesh.c @@ -1390,7 +1390,6 @@ mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, case IEEE80211_FC0_SUBTYPE_PROBE_REQ: { uint8_t *ssid, *meshid, *rates, *xrates; - uint8_t *sfrm; if (vap->iv_state != IEEE80211_S_RUN) { IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT, @@ -1414,7 +1413,6 @@ mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, * [tlv] mesh id */ ssid = meshid = rates = xrates = NULL; - sfrm = frm; while (efrm - frm > 1) { IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return); switch (*frm) { diff --git a/sys/netproto/802_11/wlan/ieee80211_sta.c b/sys/netproto/802_11/wlan/ieee80211_sta.c index 3f1f1ad..e294a2f 100644 --- a/sys/netproto/802_11/wlan/ieee80211_sta.c +++ b/sys/netproto/802_11/wlan/ieee80211_sta.c @@ -942,7 +942,6 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, { struct ieee80211vap *vap = ni->ni_vap; uint8_t *challenge; - int estatus; /* * NB: this can happen as we allow pre-shared key @@ -956,7 +955,6 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_AUTH, ni->ni_macaddr, "shared key auth", "%s", " PRIVACY is disabled"); - estatus = IEEE80211_STATUS_ALG; goto bad; } /* @@ -970,7 +968,6 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, ni->ni_macaddr, "shared key auth", "bad sta auth mode %u", ni->ni_authmode); vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */ - estatus = IEEE80211_STATUS_ALG; goto bad; } @@ -982,7 +979,6 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, "ie %d/%d too long", frm[0], (int)((frm[1] + 2) - (efrm - frm))); vap->iv_stats.is_rx_bad_auth++; - estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } if (*frm == IEEE80211_ELEMID_CHALLENGE) @@ -997,7 +993,6 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, ni->ni_macaddr, "shared key auth", "%s", "no challenge"); vap->iv_stats.is_rx_bad_auth++; - estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } if (challenge[1] != IEEE80211_CHALLENGE_LEN) { @@ -1005,7 +1000,6 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, ni->ni_macaddr, "shared key auth", "bad challenge len %d", challenge[1]); vap->iv_stats.is_rx_bad_auth++; - estatus = IEEE80211_STATUS_CHALLENGE; goto bad; } default: diff --git a/sys/platform/pc64/x86_64/pmap.c b/sys/platform/pc64/x86_64/pmap.c index 9fe87e6..50a6990 100644 --- a/sys/platform/pc64/x86_64/pmap.c +++ b/sys/platform/pc64/x86_64/pmap.c @@ -755,8 +755,6 @@ pmap_bootstrap(vm_paddr_t *firstaddr) { vm_offset_t va; pt_entry_t *pte; - struct mdglobaldata *gd; - int pg; KvaStart = VM_MIN_KERNEL_ADDRESS; KvaEnd = VM_MAX_KERNEL_ADDRESS; @@ -891,15 +889,6 @@ pmap_bootstrap(vm_paddr_t *firstaddr) #endif } #endif - - /* - * We need to finish setting up the globaldata page for the BSP. - * locore has already populated the page table for the mdglobaldata - * portion. - */ - pg = MDGLOBALDATA_BASEALLOC_PAGES; - gd = &CPU_prvspace[0].mdglobaldata; - cpu_invltlb(); } -- 1.7.7.2