2003-09-09 23:59:54

by Randy.Dunlap

Subject: [PATCH] pdc4030: return needs value; function needs return;

Hi,

Please apply to 2.6.0-test5.

--
~Randy


diff -Naurp ./drivers/ide/legacy/pdc4030.c~clean ./drivers/ide/legacy/pdc4030.c
--- ./drivers/ide/legacy/pdc4030.c~clean 2003-09-08 12:50:06.000000000 -0700
+++ ./drivers/ide/legacy/pdc4030.c 2003-09-09 16:35:33.000000000 -0700
@@ -304,7 +304,7 @@ int __init ide_probe_for_pdc4030(void)

#ifndef MODULE
if (enable_promise_support == 0)
- return;
+ return 0;
#endif

for (index = 0; index < MAX_HWIFS; index++) {
@@ -317,7 +317,7 @@ int __init ide_probe_for_pdc4030(void)
#endif
}
}
-#ifdef MODULE
+#ifndef MODULE
return 0;
#endif
}

2003-09-10 01:12:17

by Bartlomiej Zolnierkiewicz

Subject: Re: [PATCH] pdc4030: return needs value; function needs return;

Hi,

On Wednesday 10 of September 2003 01:54, Randy.Dunlap wrote:
> @@ -317,7 +317,7 @@ int __init ide_probe_for_pdc4030(void)
> #endif
> }
> }
> -#ifdef MODULE
> +#ifndef MODULE
> return 0;
> #endif
> }

This is wrong, we will now get warning for module instead of built-in.
Proper fix is to remove this #ifdef.

--bartlomiej

2003-09-10 04:37:04

by Randy.Dunlap

Subject: Re: [PATCH] pdc4030: return needs value; function needs return;

On Wed, 10 Sep 2003 03:14:26 +0200 Bartlomiej Zolnierkiewicz <[email protected]> wrote:

|
| Hi,
|
| On Wednesday 10 of September 2003 01:54, Randy.Dunlap wrote:
| > @@ -317,7 +317,7 @@ int __init ide_probe_for_pdc4030(void)
| > #endif
| > }
| > }
| > -#ifdef MODULE
| > +#ifndef MODULE
| > return 0;
| > #endif
| > }
|
| This is wrong, we will now get warning for module instead of built-in.
| Proper fix is to remove this #ifdef.

Yes, sorry about that.
Here's the corrected patch for 2.6.0-test5.

--
~Randy


patch_name: pdc4030_returns.patch
patch_version: 2003-09-09.21:27:28
author: Randy.Dunlap <[email protected]>
description: return needs a value; function needs a return;
product: Linux
product_versions: 260-test5
maintainer: [email protected]
diffstat: =
drivers/ide/legacy/pdc4030.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)

diff -Naur ./drivers/ide/legacy/pdc4030.c~pdcleg ./drivers/ide/legacy/pdc4030.c
--- ./drivers/ide/legacy/pdc4030.c~pdcleg 2003-09-08 12:50:06.000000000 -0700
+++ ./drivers/ide/legacy/pdc4030.c 2003-09-09 21:25:20.000000000 -0700
@@ -304,7 +304,7 @@

#ifndef MODULE
if (enable_promise_support == 0)
- return;
+ return 0;
#endif

for (index = 0; index < MAX_HWIFS; index++) {
@@ -317,9 +317,7 @@
#endif
}
}
-#ifdef MODULE
return 0;
-#endif
}

static void __exit release_pdc4030(ide_hwif_t *hwif, ide_hwif_t *mate)