From be6e933da42059c06ea238e94b93b62108dcc3d3 Mon Sep 17 00:00:00 2001 From: XazZ Date: Sat, 26 Jan 2008 17:40:50 +0100 Subject: [PATCH] slightly cleaned up code (thanks to matteo) some coding style fixes --- acx_struct.h | 2 +- common.c | 3 +-- pci.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/acx_struct.h b/acx_struct.h index 6fb4257..68babd5 100644 --- a/acx_struct.h +++ b/acx_struct.h @@ -65,7 +65,7 @@ enum { acx_debug = 0 }; #define DEVTYPE_PCI 0 #define DEVTYPE_USB 1 -#if !defined(CONFIG_ACX_MAC80211_PCI) && !defined(CONFIG_ACX_MAC80211_USB) +#if !(defined(CONFIG_ACX_MAC80211_PCI) || defined(CONFIG_ACX_MAC80211_USB)) #error Driver must include PCI and/or USB support. You selected neither. #endif diff --git a/common.c b/common.c index 687a043..d0aa775 100644 --- a/common.c +++ b/common.c @@ -4274,13 +4274,12 @@ void acx_remove_interface(struct ieee80211_hw *hw, flush_scheduled_work(); acx_unlock(adev, flags); - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) printk(KERN_INFO "Virtual interface removed " + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) "(type: 0x%08X, ID: %d, MAC: " MAC_FMT ")\n", conf->type, conf->if_id, MAC_ARG(conf->mac_addr)); #else - printk(KERN_INFO "Virtual interface removed " "(type: 0x%08X)\n", conf->type); #endif diff --git a/pci.c b/pci.c index ef213b1..87eb365 100644 --- a/pci.c +++ b/pci.c @@ -918,7 +918,7 @@ int acxpci_s_reset_dev(acx_device_t * adev) msg = "eCPU is already running. "; goto end_unlock; } -#ifdef WE_DONT_NEED_THAT_DO_WE +#if 0 if (read_reg16(adev, IO_ACX_SOR_CFG) & 2) { /* eCPU most likely means "embedded CPU" */ msg = "eCPU did not start after boot from flash. "; -- 2.11.4.GIT