Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1035117d authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Greg Kroah-Hartman
Browse files

staging: rts_pstor: use #ifdef instead of #if 



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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c6cdaded

drivers/staging/rts_pstor/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#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_DEBUGPN(x...) printk(KERN_DEBUG x)

#define RTSX_DEBUGPX(x...) printk(x)

drivers/staging/rts_pstor/rtsx_chip.c

+2 −2
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ void rtsx_polling_func(struct rtsx_chip *chip) 


#ifdef SUPPORT_OCP

	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)) {

			RTSX_DEBUGP("Over current, OCPSTAT is 0x%x\n", chip->ocp_stat);

		}

drivers/staging/rts_pstor/sd.c

+2 −2
Original line number Diff line number Diff line
@@ -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, CLK_CTL, CHANGE_CLK, 0);

	} else {

#if CONFIG_RTS_PSTOR_DEBUG

#ifdef CONFIG_RTS_PSTOR_DEBUG

		rtsx_read_register(chip, SD_VP_CTL, &val);

		RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", 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;



Fail:

#if CONFIG_RTS_PSTOR_DEBUG

#ifdef CONFIG_RTS_PSTOR_DEBUG

	rtsx_read_register(chip, SD_VP_CTL, &val);

	RTSX_DEBUGP("SD_VP_CTL: 0x%x\n", val);

	rtsx_read_register(chip, SD_DCMPS_CTL, &val);

drivers/staging/rts_pstor/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ do { \ 
#define TRACE_GOTO(chip, label)	goto label

#endif



#if CONFIG_RTS_PSTOR_DEBUG

#ifdef CONFIG_RTS_PSTOR_DEBUG

static inline void rtsx_dump(u8 *buf, int buf_len)

{

	int i;