Commit 679c489f authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Mundt

sisfb: eliminate unused variable compiler warning

Eliminate the following compiler warning on non-x86 platforms by limiting
the variable scope:

drivers/video/sis/sis_main.c:4108: warning: unused variable 'temp'
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 7ccbefe0
...@@ -4105,7 +4105,6 @@ sisfb_find_rom(struct pci_dev *pdev) ...@@ -4105,7 +4105,6 @@ sisfb_find_rom(struct pci_dev *pdev)
struct sis_video_info *ivideo = pci_get_drvdata(pdev); struct sis_video_info *ivideo = pci_get_drvdata(pdev);
void __iomem *rom_base; void __iomem *rom_base;
unsigned char *myrombase = NULL; unsigned char *myrombase = NULL;
u32 temp;
size_t romsize; size_t romsize;
/* First, try the official pci ROM functions (except /* First, try the official pci ROM functions (except
...@@ -4132,19 +4131,21 @@ sisfb_find_rom(struct pci_dev *pdev) ...@@ -4132,19 +4131,21 @@ sisfb_find_rom(struct pci_dev *pdev)
/* Otherwise do it the conventional way. */ /* Otherwise do it the conventional way. */
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
{
u32 temp;
for(temp = 0x000c0000; temp < 0x000f0000; temp += 0x00001000) { for (temp = 0x000c0000; temp < 0x000f0000; temp += 0x00001000) {
rom_base = ioremap(temp, 65536); rom_base = ioremap(temp, 65536);
if(!rom_base) if (!rom_base)
continue; continue;
if(!sisfb_check_rom(rom_base, ivideo)) { if (!sisfb_check_rom(rom_base, ivideo)) {
iounmap(rom_base); iounmap(rom_base);
continue; continue;
} }
if((myrombase = vmalloc(65536))) if ((myrombase = vmalloc(65536)))
memcpy_fromio(myrombase, rom_base, 65536); memcpy_fromio(myrombase, rom_base, 65536);
iounmap(rom_base); iounmap(rom_base);
...@@ -4152,6 +4153,7 @@ sisfb_find_rom(struct pci_dev *pdev) ...@@ -4152,6 +4153,7 @@ sisfb_find_rom(struct pci_dev *pdev)
} }
}
#endif #endif
return myrombase; return myrombase;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment