Project : madwifi
Revision : 3024
Author : br1 (Bruno Randolf)
Date : 2007-12-11 12:14:44 +0100 (Tue, 11 Dec 2007)
Log Message :
trace-0.9.3: merge r2836: Fix some sparse warnings
Affected Files:
* madwifi/branches/madwifi-trace-0.9.3/ath_hal/kern_alq.c updated
* madwifi/branches/madwifi-trace-0.9.3/mmiotrace/kmmio.c updated
* madwifi/branches/madwifi-trace-0.9.3/mmiotrace/mmio-mod.c updated
* madwifi/branches/madwifi-trace-0.9.3/mmiotrace/pf_in.c updated
Modified: madwifi/branches/madwifi-trace-0.9.3/ath_hal/kern_alq.c
===================================================================
--- madwifi/branches/madwifi-trace-0.9.3/ath_hal/kern_alq.c 2007-12-11
11:10:34 UTC (rev 3023)
+++ madwifi/branches/madwifi-trace-0.9.3/ath_hal/kern_alq.c 2007-12-11
11:14:44 UTC (rev 3024)
@@ -77,7 +77,7 @@
#define ALD_LOCK() spin_lock(&ald_lock)
#define ALD_UNLOCK() spin_unlock(&ald_lock)
-DECLARE_WAIT_QUEUE_HEAD(ald_waitq);
+static DECLARE_WAIT_QUEUE_HEAD(ald_waitq);
#define ALD_WAIT(condition) do { \
ALD_UNLOCK(); \
wait_event_interruptible(ald_waitq, condition); \
@@ -237,7 +237,7 @@
} else
spin_unlock_irqrestore(&alq->aq_lock, flags);
- filp_close(alq->aq_fp, /*XXX*/0);
+ filp_close(alq->aq_fp, /*XXX*/NULL);
}
/*
@@ -389,7 +389,7 @@
bad2:
kfree(alq);
bad1:
- filp_close(f, /*XXX*/0);
+ filp_close(f, /*XXX*/NULL);
return error;
}
EXPORT_SYMBOL(alq_open);
Modified: madwifi/branches/madwifi-trace-0.9.3/mmiotrace/kmmio.c
===================================================================
--- madwifi/branches/madwifi-trace-0.9.3/mmiotrace/kmmio.c 2007-12-11
11:10:34 UTC (rev 3023)
+++ madwifi/branches/madwifi-trace-0.9.3/mmiotrace/kmmio.c 2007-12-11
11:14:44 UTC (rev 3024)
@@ -30,7 +30,7 @@
static struct list_head kmmio_page_table[KMMIO_PAGE_TABLE_SIZE];
unsigned int kmmio_count = 0;
-unsigned int handler_registered = 0;
+static unsigned int handler_registered = 0;
static spinlock_t kmmio_lock = SPIN_LOCK_UNLOCKED;
static int cpu = -1;
static struct kmmio_fault_page *cur_page = NULL;
@@ -41,11 +41,11 @@
int kmmio_page_fault_notifier(struct notifier_block *nb, unsigned long val,
void *args);
int kmmio_die_notifier(struct notifier_block *nb, unsigned long val, void
*args);
-struct notifier_block nb_page_fault = {
+static struct notifier_block nb_page_fault = {
.notifier_call = kmmio_page_fault_notifier
};
-struct notifier_block nb_die = {
+static struct notifier_block nb_die = {
.notifier_call = kmmio_die_notifier
};
Modified: madwifi/branches/madwifi-trace-0.9.3/mmiotrace/mmio-mod.c
===================================================================
--- madwifi/branches/madwifi-trace-0.9.3/mmiotrace/mmio-mod.c 2007-12-11
11:10:34 UTC (rev 3023)
+++ madwifi/branches/madwifi-trace-0.9.3/mmiotrace/mmio-mod.c 2007-12-11
11:14:44 UTC (rev 3024)
@@ -44,7 +44,7 @@
void (*kmmio_logmsg)(void *ah, u8 write, u_int reg, u_int32_t val) = NULL;
EXPORT_SYMBOL(kmmio_logmsg);
-struct {
+static struct {
unsigned long addr;
unsigned long ip;
enum reason_type type;
@@ -89,7 +89,7 @@
pte_val(*pte_offset_kernel(pmd, address)) & _PAGE_PRESENT);
};
-void pre(struct kmmio_probe *p, struct pt_regs *regs, unsigned long addr)
+static void pre(struct kmmio_probe *p, struct pt_regs *regs, unsigned long
addr)
{
const unsigned long cpu = smp_processor_id();
const unsigned long instptr = instruction_pointer(regs);
@@ -177,7 +177,7 @@
}
-void post(struct kmmio_probe *p, unsigned long condition, struct pt_regs *regs)
+static void post(struct kmmio_probe *p, unsigned long condition, struct
pt_regs *regs)
{
const unsigned long cpu = smp_processor_id();
Modified: madwifi/branches/madwifi-trace-0.9.3/mmiotrace/pf_in.c
===================================================================
--- madwifi/branches/madwifi-trace-0.9.3/mmiotrace/pf_in.c 2007-12-11
11:10:34 UTC (rev 3023)
+++ madwifi/branches/madwifi-trace-0.9.3/mmiotrace/pf_in.c 2007-12-11
11:14:44 UTC (rev 3024)
@@ -47,7 +47,6 @@
#include <linux/slab.h>
#include <asm/io.h>
*/
-#include <stddef.h>
#define PREFIX_NAME "FI_PF"
/*#include <linux/fi/fi.h>
#include <linux/fi/fi_interface.h>
@@ -73,7 +72,7 @@
};
#endif
-int skip_prefix(unsigned char *addr, int *shorted, int *enlarged, int *rexr)
+static int skip_prefix(unsigned char *addr, int *shorted, int *enlarged, int
*rexr)
{
int i;
unsigned char *p = addr;
@@ -97,7 +96,7 @@
return p-addr;
}
-int get_opcode(unsigned char *addr, unsigned int *opcode)
+static int get_opcode(unsigned char *addr, unsigned int *opcode)
{
int len;
@@ -302,7 +301,7 @@
#endif
#ifdef __i386__
-unsigned char *get_reg_w8(int no, regs_t *regs)
+static unsigned char *get_reg_w8(int no, regs_t *regs)
{
unsigned char *rv = NULL;
@@ -339,9 +338,9 @@
return rv;
}
-unsigned long *get_reg_w32(int no, regs_t *regs)
+static long *get_reg_w32(int no, regs_t *regs)
{
- unsigned long *rv = NULL;
+ long *rv = NULL;
switch (no) {
case EAX:
@@ -435,9 +434,9 @@
return rv;
}
-unsigned long *get_reg_w32(int no, regs_t *regs)
+static long *get_reg_w32(int no, regs_t *regs)
{
- unsigned long *rv = NULL;
+ long *rv = NULL;
switch (no) {
case RAX:
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
|
