2001-12-05 23:21:18

by Robert Love

Subject: [PATCH] simple ide without proc compile fix

Attached patch is a repost now against 2.4.17-pre4.

IDE will not compile without CONFIG_PROC_FS defined. This patch fixes
that.

Yes, ifdefs in the code are not preferred. But this is merely following
the pattern in the rest of the ide*.c files (see other uses of
ide_remove_proc_entries -- just these two seem to be without ifdefs).

Please, apply.

Robert Love

--- linux-2.4.17-pre4/drivers/ide/ide-disk.c Wed Dec 5 15:16:57 2001
+++ linux/drivers/ide/ide-disk.c Wed Dec 5 18:13:35 2001
@@ -858,8 +858,10 @@
}
/* We must remove proc entries defined in this module.
Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
if (drive->proc)
ide_remove_proc_entries(drive->proc, idedisk_proc);
+#endif
}
ide_unregister_module(&idedisk_module);
}
--- linux-2.4.17-pre4/drivers/ide/ide-floppy.c Wed Dec 5 15:16:57 2001
+++ linux/drivers/ide/ide-floppy.c Wed Dec 5 18:13:35 2001
@@ -2071,8 +2071,10 @@
}
/* We must remove proc entries defined in this module.
Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
if (drive->proc)
ide_remove_proc_entries(drive->proc, idefloppy_proc);
+#endif
}
ide_unregister_module(&idefloppy_module);
}

2001-12-06 04:48:54

by David Weinehall

Subject: Re: [PATCH] simple ide without proc compile fix

On Wed, Dec 05, 2001 at 06:20:49PM -0500, Robert Love wrote:
> Attached patch is a repost now against 2.4.17-pre4.
>
> IDE will not compile without CONFIG_PROC_FS defined. This patch fixes
> that.
>
> Yes, ifdefs in the code are not preferred. But this is merely following
> the pattern in the rest of the ide*.c files (see other uses of
> ide_remove_proc_entries -- just these two seem to be without ifdefs).

Wouldn't a dummy, in case of no proc, be preferable? That'd make it
possible to remove all the #ifdef CONFIG_PROC_FS


/David
_ _
// David Weinehall <[email protected]> /> Northern lights wander \\
// Maintainer of the v2.0 kernel // Dance across the winter sky //
\> http://www.acc.umu.se/~tao/ </ Full colour fire </

2001-12-06 05:09:27

by Robert Love

Subject: Re: [PATCH] simple ide without proc compile fix

On Wed, 2001-12-05 at 23:48, David Weinehall wrote:

> Wouldn't a dummy, in case of no proc, be preferable? That'd make it
> possible to remove all the #ifdef CONFIG_PROC_FS

Yes, but like I said I'm just fixing a bug (by mimicking the other
code's behavior). It certainly is preferable to do what you say.

There is one issue, though. IDE code doesn't seem to have any common
header. With the function in multiple files, that complicates thing ...

Robert Love