misc ISAPNP cleanups
Subsystems (2)
PATCH 1/1 misc ISAPNP cleanups
The patch below removes some completely unused code and makes some needlessly global code static in drivers/pnp/isapnp/core.c .
Please review whether this patch is correct or whether it conflicts with pending ISAPNP updates/usages.
diffstat output:
drivers/pnp/isapnp/core.c | 47 ++++++++------------------------------ include/linux/isapnp.h | 20 ---------------- 2 files changed, 11 insertions(+), 56 deletions(-)
include/linux/isapnp.h renamed from include/linux/isapnp.h.old +0 -20
@@ -100,16 +100,7 @@int isapnp_cfg_begin (int csn,int device);int isapnp_cfg_end (void );unsigned char isapnp_read_byte (unsigned char idx); -unsigned short isapnp_read_word (unsigned char idx); -unsigned int isapnp_read_dword (unsigned char idx);void isapnp_write_byte (unsigned char idx,unsigned char val); -void isapnp_write_word (unsigned char idx,unsigned short val); -void isapnp_write_dword (unsigned char idx,unsigned int val); -void isapnp_wake (unsigned char csn); -void isapnp_device (unsigned char device); -void isapnp_activate (unsigned char device); -void isapnp_deactivate (unsigned char device); -void *isapnp_alloc (long size);#ifdef CONFIG_PROC_FS int isapnp_proc_init (void );
@@ -119,9 +110,6 @@static inline int isapnp_proc_done (void ) {return 0 ; }#endif -/* init/main.c */ -int isapnp_init (void ); -/* compat */ struct pnp_card *pnp_find_card(unsigned short vendor, unsigned short device,
@@ -138,15 +126,7 @@static inline int isapnp_cfg_begin (int csn,int device) {return -ENODEV ; }static inline int isapnp_cfg_end (void ) {return -ENODEV ; }static inline unsigned char isapnp_read_byte (unsigned char idx) {return 0xff ; } -static inline unsigned short isapnp_read_word (unsigned char idx) {return 0xffff ; } -static inline unsigned int isapnp_read_dword (unsigned char idx) {return 0xffffffff ; }static inline void isapnp_write_byte (unsigned char idx,unsigned char val) { ; } -static inline void isapnp_write_word (unsigned char idx,unsigned short val) { ; } -static inline void isapnp_write_dword (unsigned char idx,unsigned int val) { ; } -static inline void isapnp_wake (unsigned char csn) { ; } -static inline void isapnp_device (unsigned char device) { ; } -static inline void isapnp_activate (unsigned char device) { ; } -static inline void isapnp_deactivate (unsigned char device) { ; } static inline struct pnp_card *pnp_find_card(unsigned short vendor, unsigned short device,
drivers/pnp/isapnp/core.c renamed from drivers/pnp/isapnp/core.c.old +11 -36
109 lines not on this page · raw message
Quoted 7 lines · Adrian Bunk
The patch below removes some completely unused code and makes some needlessly global code static in
drivers/pnp/isapnp/core.c.Please review whether this patch is correct or whether it conflicts with pending ISAPNP updates/usages.
Quoted 8 lines
diffstat output:
drivers/pnp/isapnp/core.c | 47 ++++++++------------------------------ include/linux/isapnp.h | 20 ---------------- 2 files changed, 11 insertions(+), 56 deletions(-)Signed-off-by Adrian Bunk <[email protected]>
I have to check that this doesn't break any obscure isapnp drivers. Otherwise it looks good. Some of them, like "isapnp_alloc", look obvious.
Thanks,
Adam
Quoted 14 lines · Adam Belay
Quoted 13 lines · Adrian Bunk
The patch below removes some completely unused code and makes some needlessly global code static in
drivers/pnp/isapnp/core.c.Please review whether this patch is correct or whether it conflicts with pending ISAPNP updates/usages.
diffstat output:
drivers/pnp/isapnp/core.c | 47 ++++++++------------------------------ include/linux/isapnp.h | 20 ---------------- 2 files changed, 11 insertions(+), 56 deletions(-)
Quoted 4 lines
Quoted 2 lines
Signed-off-by Adrian Bunk <[email protected]>I have to check that this doesn't break any obscure isapnp drivers. Otherwise
Why are these "obscure isapnp drivers" not included in the kernel?
Quoted 4 lines
it looks good. Some of them, like "
isapnp_alloc", look obvious.Thanks,
Adam
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed