lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rts_pstor: use #ifdef instead of #if

Browse Source 
This patch fixes a number of the following warnings:
warning: "CONFIG_RTS_PSTOR_DEBUG" is not defined

The code uses '#if CONFIG_RTS_PSTOR_DEBUG' when it should be using '#ifdef'

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jeff Mahoney
2011-04-12 21:05:33 -04:00
committed by Greg Kroah-Hartman
parent c6cdaded14
commit 1035117d2a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/rts_pstor/debug.h
View File

@@ -28,7 +28,7 @@
#define RTSX_STOR "rts_pstor: " #define RTSX_STOR "rts_pstor: "
#if CONFIG_RTS_PSTOR_DEBUG #ifdef CONFIG_RTS_PSTOR_DEBUG
#define RTSX_DEBUGP(x...) printk(KERN_DEBUG RTSX_STOR x) #define RTSX_DEBUGP(x...) printk(KERN_DEBUG RTSX_STOR x)
#define RTSX_DEBUGPN(x...) printk(KERN_DEBUG x) #define RTSX_DEBUGPN(x...) printk(KERN_DEBUG x)
#define RTSX_DEBUGPX(x...) printk(x) #define RTSX_DEBUGPX(x...) printk(x)

4
drivers/staging/rts_pstor/rtsx_chip.c
View File

@@ -1312,11 +1312,11 @@ void rtsx_polling_func(struct rtsx_chip *chip)
#ifdef SUPPORT_OCP #ifdef SUPPORT_OCP
if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) { if (CHECK_LUN_MODE(chip, SD_MS_2LUN)) {
#if CONFIG_RTS_PSTOR_DEBUG #ifdef CONFIG_RTS_PSTOR_DEBUG
if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER | MS_OC_NOW | MS_OC_EVER)) { if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER | MS_OC_NOW | MS_OC_EVER)) {
RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", chip->ocp_stat); RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", chip->ocp_stat);
} }
#endif #endif
if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) { if (chip->ocp_stat & (SD_OC_NOW | SD_OC_EVER)) {
if (chip->card_exist & SD_CARD) { if (chip->card_exist & SD_CARD) {

4
drivers/staging/rts_pstor/sd.c
View File

@@ -909,7 +909,7 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET); RTSX_WRITE_REG(chip, SD_VPCLK0_CTL, PHASE_NOT_RESET, PHASE_NOT_RESET);
RTSX_WRITE_REG(chip, CLK_CTL, CHANGE_CLK, 0); RTSX_WRITE_REG(chip, CLK_CTL, CHANGE_CLK, 0);
} else { } else {
#if CONFIG_RTS_PSTOR_DEBUG #ifdef CONFIG_RTS_PSTOR_DEBUG
rtsx_read_register(chip, SD_VP_CTL, &val); rtsx_read_register(chip, SD_VP_CTL, &val);
RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", val); RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", val);
rtsx_read_register(chip, SD_DCMPS_CTL, &val); rtsx_read_register(chip, SD_DCMPS_CTL, &val);
@@ -958,7 +958,7 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
return STATUS_SUCCESS; return STATUS_SUCCESS;
Fail: Fail:
#if CONFIG_RTS_PSTOR_DEBUG #ifdef CONFIG_RTS_PSTOR_DEBUG
rtsx_read_register(chip, SD_VP_CTL, &val); rtsx_read_register(chip, SD_VP_CTL, &val);
RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", val); RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", val);
rtsx_read_register(chip, SD_DCMPS_CTL, &val); rtsx_read_register(chip, SD_DCMPS_CTL, &val);

2
drivers/staging/rts_pstor/trace.h
View File

@@ -82,7 +82,7 @@ do { \
#define TRACE_GOTO(chip, label) goto label #define TRACE_GOTO(chip, label) goto label
#endif #endif
#if CONFIG_RTS_PSTOR_DEBUG #ifdef CONFIG_RTS_PSTOR_DEBUG
static inline void rtsx_dump(u8 *buf, int buf_len) static inline void rtsx_dump(u8 *buf, int buf_len)
{ {
int i; int i;