[PATCH 0/2] can: pch_can: fix sparse warnings and section mismatch

[PATCH 0/2] can: pch_can: fix sparse warnings and section mismatch

[Marc Kleine-Budde]

Hello,

this patch fixes two problems found during compile time, a sparse warning
and a section mismatch.

These patches apply to net-2.6/master

cheers, Marc

---

The following changes since commit 7a876b0efcba3804da3051313445fa7be751cab7:

  IPv6: Temp addresses are immediately deleted. (2010-10-26 12:35:13 -0700)

are available in the git repository at:
  git://git.pengutronix.de/git/mkl/linux-2.6.git can/pch_can-for-net-2.6

Marc Kleine-Budde (2):
      can: pch_can: fix sparse warning
      can: pch_can: fix section mismatch warning by using a whitelisted name

 drivers/net/can/pch_can.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

[PATCH 1/2] can: pch_can: fix sparse warning

[Marc Kleine-Budde]

This patch fixes the following sparse warning:

drivers/net/can/pch_can.c:231:26: warning: incorrect type in argument 1 (different address spaces)
drivers/net/can/pch_can.c:231:26:    expected unsigned int [usertype] *addr
drivers/net/can/pch_can.c:231:26:    got unsigned int [noderef] <asn:2>*<noident>

Let pch_can_bit_{set,clear} first parameter be a void __iomem pointer.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
---
 drivers/net/can/pch_can.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 55ec324..c63209f 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -213,12 +213,12 @@ static DEFINE_PCI_DEVICE_TABLE(pch_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, pch_pci_tbl);
 
-static inline void pch_can_bit_set(u32 *addr, u32 mask)
+static inline void pch_can_bit_set(void __iomem *addr, u32 mask)
 {
 	iowrite32(ioread32(addr) | mask, addr);
 }
 
-static inline void pch_can_bit_clear(u32 *addr, u32 mask)
+static inline void pch_can_bit_clear(void __iomem *addr, u32 mask)
 {
 	iowrite32(ioread32(addr) & ~mask, addr);
 }
-- 
1.7.2.3

[PATCH 2/2] can: pch_can: fix section mismatch warning by using a whitelisted name

[Marc Kleine-Budde]

This patch fixes the following section mismatch warning:

WARNING: drivers/net/can/pch_can.o(.data+0x18):
Section mismatch in reference from the variable pch_can_pcidev
to the variable .devinit.rodata:pch_pci_tbl
The variable pch_can_pcidev references
the variable __devinitconst pch_pci_tbl

This is actually a false positive which is fixed by giving the offending
variable a whitelisted name, it's renamed to "pch_can_pci_driver".
This makes sense because the variable is of the type "struct pci_driver".

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
---
 drivers/net/can/pch_can.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index c63209f..6727182 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1437,7 +1437,7 @@ probe_exit_endev:
 	return rc;
 }
 
-static struct pci_driver pch_can_pcidev = {
+static struct pci_driver pch_can_pci_driver = {
 	.name = "pch_can",
 	.id_table = pch_pci_tbl,
 	.probe = pch_can_probe,
@@ -1448,13 +1448,13 @@ static struct pci_driver pch_can_pcidev = {
 
 static int __init pch_can_pci_init(void)
 {
-	return pci_register_driver(&pch_can_pcidev);
+	return pci_register_driver(&pch_can_pci_driver);
 }
 module_init(pch_can_pci_init);
 
 static void __exit pch_can_pci_exit(void)
 {
-	pci_unregister_driver(&pch_can_pcidev);
+	pci_unregister_driver(&pch_can_pci_driver);
 }
 module_exit(pch_can_pci_exit);
 
-- 
1.7.2.3

_______________________________________________
Socketcan-core mailing list
Socketcan-core@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/socketcan-core

Re: [PATCH 1/2] can: pch_can: fix sparse warning

[David Miller]

From: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Date: Wed, 27 Oct 2010 10:38:25 +0200

> This patch fixes the following sparse warning:
> 
> drivers/net/can/pch_can.c:231:26: warning: incorrect type in argument 1 (different address spaces)
> drivers/net/can/pch_can.c:231:26:    expected unsigned int [usertype] *addr
> drivers/net/can/pch_can.c:231:26:    got unsigned int [noderef] <asn:2>*<noident>
> 
> Let pch_can_bit_{set,clear} first parameter be a void __iomem pointer.
> 
> Signed-off-by: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>

Applied.

Re: [PATCH 2/2] can: pch_can: fix section mismatch warning by using a whitelisted name

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 27 Oct 2010 10:38:26 +0200

> This patch fixes the following section mismatch warning:
> 
> WARNING: drivers/net/can/pch_can.o(.data+0x18):
> Section mismatch in reference from the variable pch_can_pcidev
> to the variable .devinit.rodata:pch_pci_tbl
> The variable pch_can_pcidev references
> the variable __devinitconst pch_pci_tbl
> 
> This is actually a false positive which is fixed by giving the offending
> variable a whitelisted name, it's renamed to "pch_can_pci_driver".
> This makes sense because the variable is of the type "struct pci_driver".
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Applied.