linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: thomas@winischhofer.net, aaro.koskinen@iki.fi
Subject: [PATCH 2/9] sisfb: delete fallback code for pci_map_rom()
Date: Fri, 19 Nov 2010 21:58:44 +0000	[thread overview]
Message-ID: <1290203931-25188-3-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1290203931-25188-1-git-send-email-aaro.koskinen@iki.fi>

If pci_map_rom() fails, there is some fallback code that basically
duplicates pci_map_rom() on non-x86 platforms. No point in that.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
 drivers/video/sis/sis_main.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 1073b70..7feb699 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -4147,23 +4147,6 @@ sisfb_find_rom(struct pci_dev *pdev)
 
         }
 
-#else
-
-	pci_read_config_dword(pdev, PCI_ROM_ADDRESS, &temp);
-	pci_write_config_dword(pdev, PCI_ROM_ADDRESS,
-			(ivideo->video_base & PCI_ROM_ADDRESS_MASK) | PCI_ROM_ADDRESS_ENABLE);
-
-	rom_base = ioremap(ivideo->video_base, 65536);
-	if(rom_base) {
-		if(sisfb_check_rom(rom_base, ivideo)) {
-			if((myrombase = vmalloc(65536)))
-				memcpy_fromio(myrombase, rom_base, 65536);
-		}
-		iounmap(rom_base);
-	}
-
-	pci_write_config_dword(pdev, PCI_ROM_ADDRESS, temp);
-
 #endif
 
 	return myrombase;
-- 
1.5.6.5


  parent reply	other threads:[~2010-11-19 21:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-19 21:58 [PATCH 0/9] sisfb: remove cruft code Aaro Koskinen
2010-11-19 21:58 ` [PATCH 1/9] sisfb: delete obsolete PCI ROM bug workaround Aaro Koskinen
2010-11-19 21:58 ` Aaro Koskinen [this message]
2010-11-19 21:58 ` [PATCH 3/9] sisfb: delete dead SIS_XORG_XF86 code Aaro Koskinen
2010-11-19 21:58 ` [PATCH 4/9] sisfb: delete redudant #define SIS_LINUX_KERNEL Aaro Koskinen
2010-11-19 21:58 ` [PATCH 5/9] sisfb: use CONFIG_FB_SIS_301/315 instead of SIS301/315H Aaro Koskinen
2010-11-19 21:58 ` [PATCH 6/9] sisfb: remove InPort/OutPort wrappers Aaro Koskinen
2010-11-19 21:58 ` [PATCH 7/9] sisfb: replace SiS_SetMemory with memset_io Aaro Koskinen
2010-11-19 21:58 ` [PATCH 8/9] sisfb: move the CONFIG warning to sis_main.c Aaro Koskinen
2010-11-19 21:58 ` [PATCH 9/9] sisfb: delete osdef.h Aaro Koskinen
2010-11-24  6:26 ` [PATCH 0/9] sisfb: remove cruft code Paul Mundt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1290203931-25188-3-git-send-email-aaro.koskinen@iki.fi \
    --to=aaro.koskinen@iki.fi \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=thomas@winischhofer.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).