Skip to contentSkip to conversation

Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined

PATCH Applied Venki Pallipadi 3 participants 4 messages Oct 23, 2008 – Oct 24, 2008

Subsystems (3)
ACPI dmaengine Intel i/oat DMA driver
lore
Share & tools
lore

Venki Pallipadi

author
#0 lore raw

PATCH 1/1 Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined

When I7300_idle driver is not configured, there is a compile time warning about IDLE_IOAT_CHANNEL not defined. Fix it.

Reported-by Suresh Siddha <[email protected]>
Signed-off-by Venkatesh Pallipadi <[email protected]>
---
 drivers/dma/ioat_dma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/ioat_dma.c +1 -1
Index: linux-2.6/drivers/dma/ioat_dma.c
===================================================================
@@ -171,7 +171,7 @@ static int ioat_dma_enumerate_channels(s
 	xfercap_scale = readb(device->reg_base + IOAT_XFERCAP_OFFSET);
 	xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale));
 
-#if CONFIG_I7300_IDLE_IOAT_CHANNEL
+#ifdef CONFIG_I7300_IDLE_IOAT_CHANNEL
 	device->common.chancnt--;
 #endif
 	for (i = 0; i < device->common.chancnt; i++) {
reviewer Applied
#1 lore raw

applied.

thanks,
-len

Quoted 26 lines · Venki Pallipadi

When I7300_idle driver is not configured, there is a compile time warning about IDLE_IOAT_CHANNEL not defined. Fix it.

Reported-by Suresh Siddha <[email protected]>
Signed-off-by Venkatesh Pallipadi <[email protected]>
---
 drivers/dma/ioat_dma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/dma/ioat_dma.c
===================================================================

drivers/dma/ioat_dma.c +1 -1
@@ -171,7 +171,7 @@ static int ioat_dma_enumerate_channels(s
 	xfercap_scale = readb(device->reg_base + IOAT_XFERCAP_OFFSET);
 	xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale));
 
-#if CONFIG_I7300_IDLE_IOAT_CHANNEL
+#ifdef CONFIG_I7300_IDLE_IOAT_CHANNEL
 	device->common.chancnt--;
 #endif
 	for (i = 0; i < device->common.chancnt; i++) {
#3 lore raw
In reply to Venki Pallipadi
Quoted 4 lines · Venki Pallipadi

When I7300_idle driver is not configured, there is a compile time warning about IDLE_IOAT_CHANNEL not defined. Fix it.

Please copy Maciej and myself on ioat changes.

Thanks,
Dan

author
#2 lore raw

PATCH 1/1 memory power in config; show up only when it applies

In reply to Len Brown

Len,

One more one line patch.

Thanks,
Venki

Repair the config option for I7300_IDLE. The menu will now only show up when applicable.

Signed-off-by Venkatesh Pallipadi <[email protected]>
---
 drivers/idle/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/idle/Kconfig +1 -1
Index: linux-2.6/drivers/idle/Kconfig
===================================================================
@@ -1,5 +1,6 @@
 
 menu "Memory power savings"
+depends on X86_64
 
 config I7300_IDLE_IOAT_CHANNEL
 	bool

@@ -7,7 +8,6 @@ config I7300_IDLE_IOAT_CHANNEL
 config I7300_IDLE
 	tristate "Intel chipset idle power saving driver"
 	select I7300_IDLE_IOAT_CHANNEL
-	depends on X86_64
 	help
 	  Enable idle power savings with certain Intel server chipsets.
 	  The chipset must have I/O AT support, such as the Intel 7300.