Skip to contentSkip to conversation

e1000: fix compile warning

PATCH New Wolfgang Denk 2 participants 5 messages Nov 22, 2010 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e1000: fix compile warning

Get rid of compiler warning:
e1000.c: In function 'e1000_transmit':
e1000.c:5028: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type

---
 drivers/net/e1000.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/e1000.c +2 -1
index 60b04c2..5f390bd 100644
@@ -5018,6 +5018,7 @@ TRANSMIT - Transmit a frame
 static int
 e1000_transmit(struct eth_device *nic, volatile void *packet, int length)
 {
+	void * nv_packet = (void *)packet;
 	struct e1000_hw *hw = nic->priv;
 	struct e1000_tx_desc *txp;
 	int i = 0;
@@ -5025,7 +5026,7 @@ e1000_transmit(struct eth_device *nic, volatile void *packet, int length)
 	txp = tx_base + tx_tail;
 	tx_tail = (tx_tail + 1) % 8;
 
-	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, packet));
+	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, nv_packet));
 	txp->lower.data = cpu_to_le32(hw->txd_cmd | length);
 	txp->upper.data = 0;
 	E1000_WRITE_REG(hw, TDT, tx_tail);
Signature · 1 line
1.7.3.2
#1 lore raw

PATCH 1/1 e1000: fix compile warning

Le 22/11/2010 09:48, Wolfgang Denk a ?crit :

drivers/net/e1000.c e1000_transmit(struct eth_device *nic, volatile void *packet, int length) · line 5029

Quoted 2 lines
drivers/net/e1000.c +1 -1
-	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, packet));
+	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, nv_packet));

Wouldn't type-casting packet right here work? e.g.:

txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, ((void*)packet)));

Amicalement,

Signature · 1 line
Albert.
#2 lore raw

PATCH 1/1 e1000: fix compile warning

Dear Albert ARIBAUD,

Quoted 8 lines · In message <[email protected]> you wrote:

Le 22/11/2010 09:48, Wolfgang Denk a ?crit :

drivers/net/e1000.c e1000_transmit(struct eth_device *nic, volatile void *packet, int length) · line 5029

Quoted 2 lines
drivers/net/e1000.c +1 -1
-	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, packet));
+	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, nv_packet));

Wouldn't type-casting packet right here work? e.g.:

txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, ((void*)packet)));

No, it doesn't. The virt_to_bus() macro already has such a cast internally, but it doesn't work here.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Alan Turing thought about criteria to settle the question of  whether
machines  can think, a question of which we now know that it is about
as relevant as the question of whether submarines can swim.
                                                   -- Edsger Dijkstra
#3 lore raw

PATCH 1/1 e1000: fix compile warning

Le 22/11/2010 11:07, Wolfgang Denk a ?crit :

Quoted 10 lines

Dear Albert ARIBAUD,

Quoted 7 lines · In message<[email protected]> you wrote:

Le 22/11/2010 09:48, Wolfgang Denk a ?crit :

drivers/net/e1000.c e1000_transmit(struct eth_device *nic, volatile void *packet, int length) · line 5029

Quoted 2 lines
drivers/net/e1000.c +1 -1
-	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, packet));
+	txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, nv_packet));

Wouldn't type-casting packet right here work? e.g.:

Quoted 8 lines
Quoted 1 line

txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, ((void*)packet)));

No, it doesn't. The virt_to_bus() macro already has such a cast internally, but it doesn't work here.

Best regards,

Wolfgang Denk

Hmm, then maybe it is not the type that causes the warning, but a qualifier such as 'const' ?

Amicalement,

Signature · 1 line
Albert.
#4 lore raw

PATCH 1/1 e1000: fix compile warning

Dear Albert ARIBAUD,

Quoted 3 lines · In message <[email protected]> you wrote:
Quoted 3 lines

No, it doesn't. The virt_to_bus() macro already has such a cast internally, but it doesn't work here.

...

Quoted 2 lines

Hmm, then maybe it is not the type that causes the warning, but a qualifier such as 'const' ?

It's the 'volatile' attribute. Hence my name "nv_packet". Using a non-volatile pointer to compute the virtual address seems to be save.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Research is what I'm doing when I don't know what I'm doing.
                                                 -- Wernher von Braun