All of lore.kernel.org
 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 7/9] sisfb: replace SiS_SetMemory with memset_io
Date: Fri, 19 Nov 2010 23:58:49 +0200	[thread overview]
Message-ID: <1290203931-25188-8-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1290203931-25188-1-git-send-email-aaro.koskinen@iki.fi>

Get rid of one more wrapper.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
 drivers/video/sis/init.c  |    4 ++--
 drivers/video/sis/osdef.h |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c
index bfc6a1a..31137ad 100644
--- a/drivers/video/sis/init.c
+++ b/drivers/video/sis/init.c
@@ -1578,7 +1578,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
 
    if(SiS_Pr->SiS_ModeType >= ModeEGA) {
       if(ModeNo > 0x13) {
-	 SiS_SetMemory(memaddr, memsize, 0);
+	 memset_io(memaddr, 0, memsize);
       } else {
 	 pBuffer = (unsigned short SISIOMEMTYPE *)memaddr;
 	 for(i = 0; i < 0x4000; i++) writew(0x0000, &pBuffer[i]);
@@ -1587,7 +1587,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
       pBuffer = (unsigned short SISIOMEMTYPE *)memaddr;
       for(i = 0; i < 0x4000; i++) writew(0x0720, &pBuffer[i]);
    } else {
-      SiS_SetMemory(memaddr, 0x8000, 0);
+      memset_io(memaddr, 0, 0x8000);
    }
 }
 
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index be7f306..af5e9a2 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -63,6 +63,4 @@
 #warning sisfb will not work!
 #endif
 
-#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)
-
 #endif  /* _OSDEF_H_ */
-- 
1.5.6.5


WARNING: multiple messages have this Message-ID (diff)
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 7/9] sisfb: replace SiS_SetMemory with memset_io
Date: Fri, 19 Nov 2010 21:58:49 +0000	[thread overview]
Message-ID: <1290203931-25188-8-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1290203931-25188-1-git-send-email-aaro.koskinen@iki.fi>

Get rid of one more wrapper.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
---
 drivers/video/sis/init.c  |    4 ++--
 drivers/video/sis/osdef.h |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c
index bfc6a1a..31137ad 100644
--- a/drivers/video/sis/init.c
+++ b/drivers/video/sis/init.c
@@ -1578,7 +1578,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
 
    if(SiS_Pr->SiS_ModeType >= ModeEGA) {
       if(ModeNo > 0x13) {
-	 SiS_SetMemory(memaddr, memsize, 0);
+	 memset_io(memaddr, 0, memsize);
       } else {
 	 pBuffer = (unsigned short SISIOMEMTYPE *)memaddr;
 	 for(i = 0; i < 0x4000; i++) writew(0x0000, &pBuffer[i]);
@@ -1587,7 +1587,7 @@ SiS_ClearBuffer(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
       pBuffer = (unsigned short SISIOMEMTYPE *)memaddr;
       for(i = 0; i < 0x4000; i++) writew(0x0720, &pBuffer[i]);
    } else {
-      SiS_SetMemory(memaddr, 0x8000, 0);
+      memset_io(memaddr, 0, 0x8000);
    }
 }
 
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index be7f306..af5e9a2 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -63,6 +63,4 @@
 #warning sisfb will not work!
 #endif
 
-#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)
-
 #endif  /* _OSDEF_H_ */
-- 
1.5.6.5


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

Thread overview: 22+ 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 ` 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
2010-11-19 21:58 ` [PATCH 2/9] sisfb: delete fallback code for pci_map_rom() Aaro Koskinen
2010-11-19 21:58   ` Aaro Koskinen
2010-11-19 21:58 ` [PATCH 3/9] sisfb: delete dead SIS_XORG_XF86 code Aaro Koskinen
2010-11-19 21:58   ` Aaro Koskinen
2010-11-19 21:58 ` [PATCH 4/9] sisfb: delete redudant #define SIS_LINUX_KERNEL Aaro Koskinen
2010-11-19 21:58   ` 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   ` Aaro Koskinen
2010-11-19 21:58 ` [PATCH 6/9] sisfb: remove InPort/OutPort wrappers Aaro Koskinen
2010-11-19 21:58   ` Aaro Koskinen
2010-11-19 21:58 ` Aaro Koskinen [this message]
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   ` Aaro Koskinen
2010-11-19 21:58 ` [PATCH 9/9] sisfb: delete osdef.h Aaro Koskinen
2010-11-19 21:58   ` Aaro Koskinen
2010-11-24  6:26 ` [PATCH 0/9] sisfb: remove cruft code Paul Mundt
2010-11-24  6:26   ` 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-8-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.