25/37 alpha: add printk() KERN_ constants to
Subsystems (2)
PATCH 1/1 25/37 alpha: add printk() KERN_ constants to
Signed-off-by James Nelson <[email protected]>
---
arch/alpha/kernel/smc37c93x.c +16 -17
@@ -14,11 +14,12 @@ #include <asm/io.h>#include <asm/segment.h> #define SMC_DEBUG 0 +#define PFX "37c93x: "#if SMC_DEBUG -# define DBG_DEVS (args) printk args +# define DBG_DEVS(fmt, args...) printk(KERN_DEBUG PFX "%s: " fmt, __FUNCTION__ , ## args)#else -# define DBG_DEVS (args) +# define DBG_DEVS(fmt, args...)#endif #define KB 1024
@@ -220,20 +221,18 @@ static void __init SMCReportDeviceStatusoutb (POWER_CONTROL , indexPort); currentControl =inb (dataPort); -printk (currentControl & (1 <<FDC ) + printk(KERN_DEBUG PFX currentControl & (1 << FDC) ? "\t+FDC Enabled\n" : "\t-FDC Disabled\n"); -printk (currentControl & (1 <<IDE1 ) + printk(KERN_DEBUG PFX currentControl & (1 << IDE1) ? "\t+IDE1 Enabled\n" : "\t-IDE1 Disabled\n"); -printk (currentControl & (1 <<IDE2 ) + printk(KERN_DEBUG PFX currentControl & (1 << IDE2) ? "\t+IDE2 Enabled\n" : "\t-IDE2 Disabled\n"); -printk (currentControl & (1 <<PARP ) + printk(KERN_DEBUG PFX currentControl & (1 << PARP) ? "\t+PARP Enabled\n" : "\t-PARP Disabled\n"); -printk (currentControl & (1 <<SER1 ) + printk(KERN_DEBUG PFX currentControl & (1 << SER1) ? "\t+SER1 Enabled\n" : "\t-SER1 Disabled\n"); -printk (currentControl & (1 <<SER2 ) + printk(KERN_DEBUG PFX currentControl & (1 << SER2) ? "\t+SER2 Enabled\n" : "\t-SER2 Disabled\n"); - - printk( "\n" ); }#endif
@@ -248,29 +247,29 @@ #if SMC_DEBUGSMCReportDeviceStatus (SMCUltraBase);#endif SMCEnableDevice (SMCUltraBase,SER1 ,COM1_BASE ,COM1_INTERRUPT ); -DBG_DEVS (("SMC FDC37C93X: SER1 done\n" )); +DBG_DEVS ("SER1 done\n" );SMCEnableDevice (SMCUltraBase,SER2 ,COM2_BASE ,COM2_INTERRUPT ); -DBG_DEVS (("SMC FDC37C93X: SER2 done\n" )); +DBG_DEVS ("SER2 done\n" );SMCEnableDevice (SMCUltraBase,PARP ,PARP_BASE ,PARP_INTERRUPT ); -DBG_DEVS (("SMC FDC37C93X: PARP done\n" )); +DBG_DEVS ("PARP done\n" );/* On PC164, IDE on the SMC is not enabled; CMD646 (PCI) on MB */ SMCEnableKYBD (SMCUltraBase); -DBG_DEVS (("SMC FDC37C93X: KYB done\n" )); +DBG_DEVS ("KYB done\n" );SMCEnableFDC (SMCUltraBase); -DBG_DEVS (("SMC FDC37C93X: FDC done\n" )); +DBG_DEVS ("FDC done\n" );#if SMC_DEBUG SMCReportDeviceStatus (SMCUltraBase);#endif SMCRunState (SMCUltraBase);local_irq_restore (flags); -printk ("SMC FDC37C93X Ultra I/O Controller found @ 0x%lx\n" , +pr_info (PFX "Ultra I/O Controller found @ 0x%lx\n" , SMCUltraBase);return 1 ; }else {local_irq_restore (flags); -DBG_DEVS (("No SMC FDC37C93X Ultra I/O Controller found\n" )); +DBG_DEVS ("No Ultra I/O Controller found\n" );return 0 ; } }
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors