Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262569AbVBXXoE (ORCPT ); Thu, 24 Feb 2005 18:44:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262558AbVBXXmk (ORCPT ); Thu, 24 Feb 2005 18:42:40 -0500 Received: from mailout.stusta.mhn.de ([141.84.69.5]:57097 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S262570AbVBXXhe (ORCPT ); Thu, 24 Feb 2005 18:37:34 -0500 Date: Fri, 25 Feb 2005 00:37:32 +0100 From: Adrian Bunk To: Andrew Morton Cc: Christer Weinigel , linux-kernel@vger.kernel.org Subject: [2.6 patch] i386 scx200.c: misc cleanups Message-ID: <20050224233732.GP8651@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2471 Lines: 85 The patch below contains the following cleanups: - make some needlessly global code static - #if 0 the following unused global functions: - scx200_gpio_dump - remove the following unneeded EXPORT_SYMBOL's: - scx200_gpio_lock - scx200_gpio_dump Signed-off-by: Adrian Bunk --- This patch was already sent on: - 16 Jan 2005 arch/i386/kernel/scx200.c | 9 ++++----- include/linux/scx200_gpio.h | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) --- linux-2.6.11-rc1-mm1-full/include/linux/scx200_gpio.h.old 2005-01-16 04:45:06.000000000 +0100 +++ linux-2.6.11-rc1-mm1-full/include/linux/scx200_gpio.h 2005-01-16 04:45:20.000000000 +0100 @@ -1,10 +1,8 @@ #include u32 scx200_gpio_configure(int index, u32 set, u32 clear); -void scx200_gpio_dump(unsigned index); extern unsigned scx200_gpio_base; -extern spinlock_t scx200_gpio_lock; extern long scx200_gpio_shadow[2]; #define scx200_gpio_present() (scx200_gpio_base!=0) --- linux-2.6.11-rc1-mm1-full/arch/i386/kernel/scx200.c.old 2005-01-16 04:44:09.000000000 +0100 +++ linux-2.6.11-rc1-mm1-full/arch/i386/kernel/scx200.c 2005-01-16 04:45:28.000000000 +0100 @@ -37,7 +37,6 @@ .probe = scx200_probe, }; -DEFINE_SPINLOCK(scx200_gpio_lock); static DEFINE_SPINLOCK(scx200_gpio_config_lock); static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -81,6 +80,7 @@ return config; } +#if 0 void scx200_gpio_dump(unsigned index) { u32 config = scx200_gpio_configure(index, ~0, 0); @@ -112,15 +112,16 @@ printk(" DEBOUNCE"); /* debounce */ printk("\n"); } +#endif /* 0 */ -int __init scx200_init(void) +static int __init scx200_init(void) { printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n"); return pci_module_init(&scx200_pci_driver); } -void __exit scx200_cleanup(void) +static void __exit scx200_cleanup(void) { pci_unregister_driver(&scx200_pci_driver); release_region(scx200_gpio_base, SCx200_GPIO_SIZE); @@ -131,9 +132,7 @@ EXPORT_SYMBOL(scx200_gpio_base); EXPORT_SYMBOL(scx200_gpio_shadow); -EXPORT_SYMBOL(scx200_gpio_lock); EXPORT_SYMBOL(scx200_gpio_configure); -EXPORT_SYMBOL(scx200_gpio_dump); /* Local variables: - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/