From: "Rune Torgersen" <runet@innovsys.com>
To: <linuxppc-embedded@ozlabs.org>
Subject: [PATCH] Fix compilerwarnings when using PCI9 workaround
Date: Thu, 17 Feb 2005 17:29:38 -0600 [thread overview]
Message-ID: <DCEAAC0833DD314AB0B58112AD99B93B8592BD@ismail.innsys.innovsys.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
This patch fixes compilerwarnings generated when using MPC826x PCI9
workaround.
Warnings caused by an old definition of memcpy_fromio
Signed-off-by: Rune Torgersen <runet@innovsys.com>
Rune Torgersen
System Developer
Innovative Systems LLC
1000 Innovative Drive
Mitchell, SD 57301
Ph: 605-995-6120
www.innovsys.com
[-- Attachment #2: patch_PCI9_compiler_warnings --]
[-- Type: application/octet-stream, Size: 1807 bytes --]
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/02/17 17:14:36-06:00 runet@pib.innsys.innovsys.com
# Fix compiler warnings generated when using PCI9 workaround
#
# include/asm-ppc/mpc8260_pci9.h
# 2005/02/17 17:14:27-06:00 runet@pib.innsys.innovsys.com +1 -1
# Updated declaration of memcpy_fromio to match normal case
#
# arch/ppc/syslib/m8260_pci_erratum9.c
# 2005/02/17 17:14:27-06:00 runet@pib.innsys.innovsys.com +1 -2
# Updated declaration of memcpy_fromio to match normal case
#
diff -Nru a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c
--- a/arch/ppc/syslib/m8260_pci_erratum9.c 2005-02-17 17:25:55 -06:00
+++ b/arch/ppc/syslib/m8260_pci_erratum9.c 2005-02-17 17:25:55 -06:00
@@ -374,7 +374,7 @@
idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
}
-void *memcpy_fromio(void *dest, unsigned long src, size_t count)
+void memcpy_fromio(void *dest,const volatile void __iomem *src, int count)
{
unsigned long pa = iopa((unsigned long) src);
@@ -382,7 +382,6 @@
idma_pci9_read((u8 *)dest, (u8 *)pa, count, 32, 1);
else
memcpy(dest, (void *)src, count);
- return dest;
}
EXPORT_SYMBOL(readb);
diff -Nru a/include/asm-ppc/mpc8260_pci9.h b/include/asm-ppc/mpc8260_pci9.h
--- a/include/asm-ppc/mpc8260_pci9.h 2005-02-17 17:25:55 -06:00
+++ b/include/asm-ppc/mpc8260_pci9.h 2005-02-17 17:25:55 -06:00
@@ -45,7 +45,7 @@
extern unsigned inl(unsigned port);
extern void insw_ns(unsigned port, void *buf, int ns);
extern void insl_ns(unsigned port, void *buf, int nl);
-extern void *memcpy_fromio(void *dest, unsigned long src, size_t count);
+extern void memcpy_fromio(void *dst,const volatile void __iomem *src, int count);
#endif /* !__CONFIG_8260_PCI9_DEFS */
#endif /* __KERNEL__ */
reply other threads:[~2005-02-17 23:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=DCEAAC0833DD314AB0B58112AD99B93B8592BD@ismail.innsys.innovsys.com \
--to=runet@innovsys.com \
--cc=linuxppc-embedded@ozlabs.org \
/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