2006-09-04 10:04:44

by Frederik Deweerdt

Subject: 2.6.18-rc5-mm1 ich_pata_cbl_detect returns a value despite being void

Hi,

Compiling 2.6.18-rc5-mm1 issues the following warning:
CC drivers/ata/ata_piix.o
drivers/ata/ata_piix.c: In function 'ich_pata_cbl_detect':
drivers/ata/ata_piix.c:612: warning: 'return' with a value, in
function returning void

This was introduced by the
libata-add-40pin-short-cable-support-honour-drive.patch.
The attached patch fixes the issue by assigning ap->cbl.

Regards,
Frederik

Signed-off-by: Frederik Deweerdt <[email protected]>
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e4d7873..c9c8341 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -608,8 +608,10 @@ static void ich_pata_cbl_detect(struct a
while (lap->device) {
if (lap->device == pdev->device &&
lap->subvendor == pdev->subsystem_vendor &&
- lap->subdevice == pdev->subsystem_device)
- return ATA_CBL_PATA40_SHORT;
+ lap->subdevice == pdev->subsystem_device) {
+ ap->cbl = ATA_CBL_PATA40_SHORT;
+ return;
+ }
lap++;
}


--
VGER BF report: U 0.500037

2006-09-04 10:18:13

by Alan

Subject: Re: 2.6.18-rc5-mm1 ich_pata_cbl_detect returns a value despite being void

Ar Llu, 2006-09-04 am 12:04 +0000, ysgrifennodd Frederik Deweerdt:
> Hi,
>
> Compiling 2.6.18-rc5-mm1 issues the following warning:
> CC drivers/ata/ata_piix.o
> drivers/ata/ata_piix.c: In function 'ich_pata_cbl_detect':
> drivers/ata/ata_piix.c:612: warning: 'return' with a value, in
> function returning void
>


Yep already fixed in my tree. Your fix is correct.

Acked-by: Alan Cox <[email protected]>


--
VGER BF report: H 0.0204275