Skip to contentSkip to conversation

arch/avr32: Fix build failure for avr32 caused by typo

PATCH In review Peter Huewe 3 participants 8 messages Dec 25, 2009 – Dec 28, 2009 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch/avr32: Fix build failure for avr32 caused by typo

This patch fixes a build failure introduced by the patch
atmel-mci: change use of dma slave interface by Nicolas Ferre
by changing mci_dma_slave to the correct name of mci_dma_data

This should make the avr32 tree build again.

References:
http://kisskb.ellerman.id.au/kisskb/buildresult/1893610/
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=2635d1ba711560d521f6218c585a3e0401f566e1

Patch against Linus' tree.

---
 arch/avr32/mach-at32ap/at32ap700x.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/avr32/mach-at32ap/at32ap700x.c +2 -2
index 1aa1ea5..7d4ed42 100644
@@ -1325,7 +1325,7 @@ struct platform_device *__init
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
 	struct platform_device		*pdev;
-	struct mci_dma_slave		*slave;
+	struct mci_dma_data	        *slave;
 	u32				pioa_mask;
 	u32				piob_mask;
 
@@ -1344,7 +1344,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 				ARRAY_SIZE(atmel_mci0_resource)))
 		goto fail;
 
-	slave = kzalloc(sizeof(struct mci_dma_slave), GFP_KERNEL);
+	slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
 
 	slave->sdata.dma_dev = &dw_dmac0_device.dev;
 	slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
Signature · 1 line
1.6.4.4
#1 lore raw
Quoted 6 lines · On Fri, 25 Dec 2009 20:08:45 +0100 Peter Huewe <[email protected]> wrote:

This patch fixes a build failure introduced by the patch
atmel-mci: change use of dma slave interface by Nicolas Ferre
by changing mci_dma_slave to the correct name of mci_dma_data

This should make the avr32 tree build again.

Ah, great, I have not gotten around to test this yet. Thanks for the patch. I've done some minor changes and also fixed the kzalloc/kfree error handling. Please see the inlined patch below.

Quoted 1 line

From c8d4b6c01b19044467867b24e218b8a59ed04291 Mon Sep 17 00:00:00 2001

From: Hans-Christian Egtvedt <[email protected]>
Date: Mon, 28 Dec 2009 09:08:00 +0100
Subject: [PATCH] avr32: Fix build failure when using atmel-mci caused by typo

This patch fixes a build failure introduced by the patch atmel-mci: change use of dma slave interface by Nicolas Ferre by changing mci_dma_slave to the correct name of mci_dma_data.

It also will only free the struct mci_dma_data if it has been allocated.

This should make the avr32 tree build again.

References:
http://kisskb.ellerman.id.au/kisskb/buildresult/1893610/
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=2635d1ba711560d521f6218c585a3e0401f566e1

Patch against Linus' tree.

---
 arch/avr32/mach-at32ap/at32ap700x.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
arch/avr32/mach-at32ap/at32ap700x.c +7 -6
index 1aa1ea5..6e093c3 100644
@@ -1325,7 +1325,7 @@ struct platform_device *__init
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
 	struct platform_device		*pdev;
-	struct mci_dma_slave		*slave;
+	struct mci_dma_data		*slave;
 	u32				pioa_mask;
 	u32				piob_mask;
 
@@ -1344,7 +1344,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 				ARRAY_SIZE(atmel_mci0_resource)))
 		goto fail;
 
-	slave = kzalloc(sizeof(struct mci_dma_slave), GFP_KERNEL);
+	slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
 
 	slave->sdata.dma_dev = &dw_dmac0_device.dev;
 	slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
@@ -1357,7 +1357,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 
 	if (platform_device_add_data(pdev, data,
 				sizeof(struct mci_platform_data)))
-		goto fail;
+		goto fail_free;
 
 	/* CLK line is common to both slots */
 	pioa_mask = 1 << 10;
@@ -1381,7 +1381,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 		/* Slot is unused */
 		break;
 	default:
-		goto fail;
+		goto fail_free;
 	}
 
 	select_peripheral(PIOA, pioa_mask, PERIPH_A, 0);
@@ -1408,7 +1408,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 		break;
 	default:
 		if (!data->slot[0].bus_width)
-			goto fail;
+			goto fail_free;
 
 		data->slot[1].bus_width = 0;
 		break;
@@ -1419,9 +1419,10 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 	platform_device_add(pdev);
 	return pdev;
 
+fail_free:
+	kfree(slave);
 fail:
 	data->dma_slave = NULL;
-	kfree(slave);
 	platform_device_put(pdev);
 	return NULL;
 }
Signature · 5 lines
1.6.0.4

-- 
Best regards,
Hans-Christian Egtvedt
author Acked-by
#2 lore raw

Am Montag 28 Dezember 2009 09:13:18 schrieb Hans-Christian Egtvedt:

Quoted 15 lines

On Fri, 25 Dec 2009 20:08:45 +0100

Quoted 5 lines · Peter Huewe

This patch fixes a build failure introduced by the patch
atmel-mci: change use of dma slave interface by Nicolas Ferre
by changing mci_dma_slave to the correct name of mci_dma_data

This should make the avr32 tree build again.

Ah, great, I have not gotten around to test this yet. Thanks for the patch. I've done some minor changes and also fixed the kzalloc/kfree error handling. Please see the inlined patch below.

arch/avr32/mach-at32ap/at32ap700x.c at32_add_device_mci(unsigned int id, struct · line 1350

Quoted 8 lines
arch/avr32/mach-at32ap/at32ap700x.c +1 -1
@@ -1344,7 +1344,7 @@ at32_add_device_mci(unsigned int id, struct
 mci_platform_data *data) ARRAY_SIZE(atmel_mci0_resource)))
 		goto fail;
 
-	slave = kzalloc(sizeof(struct mci_dma_slave), GFP_KERNEL);
+	slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
 
 	slave->sdata.dma_dev = &dw_dmac0_device.dev;
 	slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;

Great, thanks for the update.
The only thing that still catches my eye is that the kzalloc line can fail, so you should perhaps add something like

if (!slave) {
	printk(KERN_ERR "No memory left for at32ap700x: at32_add_device_mc");
	goto fail;
}

(not tested :)

Apart from that:

Thanks and best regards,
Peter

#3 lore raw
Quoted 29 lines · On Mon, 28 Dec 2009 10:59:30 +0100 Peter Hüwe <[email protected]> wrote:

Am Montag 28 Dezember 2009 09:13:18 schrieb Hans-Christian Egtvedt:

Quoted 15 lines

On Fri, 25 Dec 2009 20:08:45 +0100

Quoted 5 lines · Peter Huewe

This patch fixes a build failure introduced by the patch
atmel-mci: change use of dma slave interface by Nicolas Ferre
by changing mci_dma_slave to the correct name of mci_dma_data

This should make the avr32 tree build again.

Ah, great, I have not gotten around to test this yet. Thanks for the patch. I've done some minor changes and also fixed the kzalloc/kfree error handling. Please see the inlined patch below.

arch/avr32/mach-at32ap/at32ap700x.c at32_add_device_mci(unsigned int id, struct · line 1350

Quoted 8 lines
arch/avr32/mach-at32ap/at32ap700x.c +1 -1
@@ -1344,7 +1344,7 @@ at32_add_device_mci(unsigned int id, struct
 mci_platform_data *data) ARRAY_SIZE(atmel_mci0_resource)))
 		goto fail;
 
-	slave = kzalloc(sizeof(struct mci_dma_slave), GFP_KERNEL);
+	slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
 
 	slave->sdata.dma_dev = &dw_dmac0_device.dev;
 	slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;

Great, thanks for the update.
The only thing that still catches my eye is that the kzalloc line can fail, so you should perhaps add something like

Quoted 5 lines
if (!slave) {
	printk(KERN_ERR "No memory left for at32ap700x: at32_add_device_mc");
	goto fail;
}

Sounds like the patch should be split in two, one addressing the proper naming of the struct mci_dma_data and one fixing the allocation of memory and proper cleanup.

Signature · 2 lines
Best regards,
Hans-Christian Egtvedt
#4 lore raw
In reply to Peter Hüwe
Quoted 7 lines · Peter Hüwe

Great, thanks for the update.
The only thing that still catches my eye is that the kzalloc line can fail, so you should perhaps add something like

if (!slave) {
	printk(KERN_ERR "No memory left for at32ap700x: at32_add_device_mc");
	goto fail;
}

I agree, except that this is extremely unlikely to happen, so we should either drop the printk() or use pr_debug() in order to waste as little memory as possible in production systems.

I think your first patch is good as it is, so I will apply it. Please send any additional fixes as a separate patch.

Haavard

#5 lore raw

Am Montag 28 Dezember 2009 11:20:28 schrieb Haavard Skinnemoen:

Quoted 9 lines
Quoted 7 lines · Peter Hüwe

Great, thanks for the update.
The only thing that still catches my eye is that the kzalloc line can fail, so you should perhaps add something like

if (!slave) {
	printk(KERN_ERR "No memory left for at32ap700x: at32_add_device_mc");
	goto fail;
}
Quoted 3 lines

I agree, except that this is extremely unlikely to happen, so we should either drop the printk() or use pr_debug() in order to waste as little memory as possible in production systems.

ok.

Quoted 3 lines

I think your first patch is good as it is, so I will apply it. Please send any additional fixes as a separate patch.

Okay thanks for applying.

@Hans: can you create the cleanup patch or should I ?

Regards,
Peter

#6 lore raw
Quoted 10 lines · On Mon, 28 Dec 2009 11:34:36 +0100 Peter Hüwe <[email protected]> wrote:

Am Montag 28 Dezember 2009 11:20:28 schrieb Haavard Skinnemoen:

Quoted 9 lines
Quoted 7 lines · Peter Hüwe

Great, thanks for the update.
The only thing that still catches my eye is that the kzalloc line can fail, so you should perhaps add something like

if (!slave) {
	printk(KERN_ERR "No memory left for at32ap700x: at32_add_device_mc");
	goto fail;
}
Quoted 5 lines
Quoted 3 lines

I agree, except that this is extremely unlikely to happen, so we should either drop the printk() or use pr_debug() in order to waste as little memory as possible in production systems.

ok.

I skipped the print message, as no other platform devices will print similar information. If people really need this kind of information they could provide a patch adding it for all the platform devices.

Quoted 7 lines
Quoted 2 lines

I think your first patch is good as it is, so I will apply it. Please send any additional fixes as a separate patch.

Okay thanks for applying.

@Hans: can you create the cleanup patch or should I ?

I'll do it, should arrive here shortly.

Signature · 2 lines
Best regards,
Hans-Christian Egtvedt
#7 lore raw
Quoted 2 lines · On Mon, 28 Dec 2009 12:07:23 +0100 Hans-Christian Egtvedt…

On Mon, 28 Dec 2009 11:34:36 +0100
Peter Hüwe <[email protected]> wrote:

<snipp>

Quoted 10 lines
Quoted 7 lines
Quoted 2 lines

I think your first patch is good as it is, so I will apply it. Please send any additional fixes as a separate patch.

Okay thanks for applying.

@Hans: can you create the cleanup patch or should I ?

I'll do it, should arrive here shortly.

"here", by here I actually meant to the [email protected] mailing list[1]. So I hope Håvard will snap it from there.

Sadly I just realized that the archives has been non functional since mid November due to server misconfiguration. Fixed now.

1: http://lists.avr32linux.org/pipermail/kernel/2009-December/005484.html

Signature · 2 lines
Best regards,
Hans-Christian Egtvedt