Home » Mailing list archives » linux-kernel » 2008 » January » 30

Re: [PATCH] [SIS190] Constify data marked as __devinitdata

Previous thread: Re: [PATCH 1/2] Char: applicom, use pci_resource_start by Jiri Slaby on Wednesday, January 30, 2008 - 7:10 am. (1 message)

Next thread: [PATCH] [NFS]: Lock daemon start/stop rework. by Denis V. Lunev on Wednesday, January 30, 2008 - 7:41 am. (5 messages)
[view original message]
From: Jonas Bonn <jonas@...>
To: <netdev@...>, <romieu@...>, <linux-kernel@...>
Cc: Jonas Bonn <jonas@...>
Subject: [PATCH] [SIS190] Constify data marked as __devinitdata
Date: Wednesday, January 30, 2008 - 6:53 am

This fixes build error as gcc complains about a "section type conflict"

due to the const __devinitdata in sis190_get_mac_addr_from_apc().

---

 drivers/net/sis190.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c

index b570402..e48e4ad 100644

--- a/drivers/net/sis190.c

+++ b/drivers/net/sis190.c

@@ -326,7 +326,7 @@ static const struct {

 	{ "SiS 191 PCI Gigabit Ethernet adapter" },

 };


-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {

+static const struct pci_device_id sis190_pci_tbl[] __devinitdata = {

 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },

 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },

 	{ 0, },

--

1.5.3.8


--
[view original message]
From: Jan Engelhardt <jengelh@...>
To: Jonas Bonn <jonas@...>
Cc: <netdev@...>, <romieu@...>, <linux-kernel@...>
Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata
Date: Wednesday, January 30, 2008 - 7:23 am

Eh? Did you mean to


-        static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };

+        static u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };


instead? Because AFAIK, const *and* __sectionmarker does not mix.

--
[view original message]
From: Jonas Bonn <jonas@...>
To: Jan Engelhardt <jengelh@...>
Cc: <netdev@...>, <romieu@...>, <linux-kernel@...>
Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata
Date: Wednesday, January 30, 2008 - 7:41 am

>


You're right... it's documented in linux/init.h that const and

__sectionmarker do not mix.  The compile error is due to the use of

const and __section marker in the function sis190_get_mac_addr_from_apc().


--
[view original message]
From: Sam Ravnborg <sam@...>
To: Jan Engelhardt <jengelh@...>
Cc: Jonas Bonn <jonas@...>, <netdev@...>, <romieu@...>, <linux-kernel@...>
Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata
Date: Wednesday, January 30, 2008 - 7:25 am

We have just introduced __initconst, __cpuinitconst, __meminitconst

for const data.

So the patch is wrong.


	Sam

--
[view original message]
From: Jan Engelhardt <jengelh@...>
To: Sam Ravnborg <sam@...>
Cc: Jonas Bonn <jonas@...>, <netdev@...>, <romieu@...>, <linux-kernel@...>
Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata
Date: Wednesday, January 30, 2008 - 9:31 am

Oh joy, more tags. Is it actually possible to combine const

with __devinitconst now?


static const uint16_t foo[] __devinitconst = { ... };

--
[view original message]
From: Sam Ravnborg <sam@...>
To: Jan Engelhardt <jengelh@...>
Cc: Jonas Bonn <jonas@...>, <netdev@...>, <romieu@...>, <linux-kernel@...>
Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata
Date: Wednesday, January 30, 2008 - 9:37 am

Yes, try it.


	Sam

--
[view original message]
From: Jonas Bonn <jonas@...>
To: <netdev@...>, <romieu@...>, <linux-kernel@...>
Cc: Jonas Bonn <jonas@...>
Subject: [PATCH] [SIS190] Use __devinitconst for const devinit data
Date: Wednesday, January 30, 2008 - 9:41 am

Mixing const and __section was previously not allowed.  New __devinitconst tag

allows this.


This fixes a gcc "section type mismatch" build error.

---

 drivers/net/sis190.c |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c

index b570402..d3126a9 100644

--- a/drivers/net/sis190.c

+++ b/drivers/net/sis190.c

@@ -326,7 +326,7 @@ static const struct {

 	{ "SiS 191 PCI Gigabit Ethernet adapter" },

 };


-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {

+static const struct pci_device_id sis190_pci_tbl[] __devinitconst = {

 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },

 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },

 	{ 0, },

@@ -1556,7 +1556,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,

 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,

 						  struct net_device *dev)

 {

-	static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };

+	static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };

 	struct sis190_private *tp = netdev_priv(dev);

 	struct pci_dev *isa_bridge;

 	u8 reg, tmp8;

--

1.5.3.8


--
[view original message]
From: Jonas Bonn <jonas@...>
To: <netdev@...>, <romieu@...>, <linux-kernel@...>
Cc: Jonas Bonn <jonas@...>
Subject: [PATCH] [SIS190] Use _devinitconst for const data
Date: Wednesday, January 30, 2008 - 7:57 am

This fixes build error as gcc complains about a "section type conflict"

due to the mixing of const and non-const data in same section.

---

 drivers/net/sis190.c |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c

index b570402..f84c02e 100644

--- a/drivers/net/sis190.c

+++ b/drivers/net/sis190.c

@@ -326,7 +326,7 @@ static const struct {

 	{ "SiS 191 PCI Gigabit Ethernet adapter" },

 };


-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {

+static struct pci_device_id sis190_pci_tbl[] __devinitconst = {

 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },

 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },

 	{ 0, },

@@ -1556,7 +1556,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,

 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,

 						  struct net_device *dev)

 {

-	static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };

+	static u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };

 	struct sis190_private *tp = netdev_priv(dev);

 	struct pci_dev *isa_bridge;

 	u8 reg, tmp8;

--

1.5.3.8


--
[view original message]
From: Sam Ravnborg <sam@...>
To: Jonas Bonn <jonas@...>
Cc: <netdev@...>, <romieu@...>, <linux-kernel@...>
Subject: Re: [PATCH] [SIS190] Use _devinitconst for const data
Date: Wednesday, January 30, 2008 - 8:21 am

--
Previous thread: Re: [PATCH 1/2] Char: applicom, use pci_resource_start by Jiri Slaby on Wednesday, January 30, 2008 - 7:10 am. (1 message)

Next thread: [PATCH] [NFS]: Lock daemon start/stop rework. by Denis V. Lunev on Wednesday, January 30, 2008 - 7:41 am. (5 messages)