2004-09-30 17:55:49

by Alan Cox

[permalink] [raw]
Subject: PATCH: minor IDE clean up I noticed

Nowdays a drive always has a driver


diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.9rc3/drivers/ide/ide-proc.c linux-2.6.9rc3/drivers/ide/ide-proc.c
--- linux.vanilla-2.6.9rc3/drivers/ide/ide-proc.c 2004-09-30 15:35:48.169975152 +0100
+++ linux-2.6.9rc3/drivers/ide/ide-proc.c 2004-09-30 16:33:46.423200288 +0100
@@ -365,20 +365,7 @@
{
unsigned short *val = (unsigned short *) page;

- /*
- * The current code can't handle a driverless
- * identify query taskfile. Now the right fix is
- * to add a 'default' driver but that is a bit
- * more work.
- *
- * FIXME: this has to be fixed for hotswap devices
- */
-
- if(DRIVER(drive))
- err = taskfile_lib_get_identify(drive, page);
- else /* This relies on the ID changes */
- val = (unsigned short *)drive->id;
-
+ err = taskfile_lib_get_identify(drive, page);
if(!err)
{
char *out = ((char *)page) + (SECTOR_WORDS * 4);


Subject: Re: PATCH: minor IDE clean up I noticed


fixed 4 days ago in ide-dev-2.6 :)

On Thursday 30 September 2004 19:54, Alan Cox wrote:
> Nowdays a drive always has a driver
>
>
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.9rc3/drivers/ide/ide-proc.c linux-2.6.9rc3/drivers/ide/ide-proc.c
> --- linux.vanilla-2.6.9rc3/drivers/ide/ide-proc.c 2004-09-30 15:35:48.169975152 +0100
> +++ linux-2.6.9rc3/drivers/ide/ide-proc.c 2004-09-30 16:33:46.423200288 +0100
> @@ -365,20 +365,7 @@
> {
> unsigned short *val = (unsigned short *) page;
>
> - /*
> - * The current code can't handle a driverless
> - * identify query taskfile. Now the right fix is
> - * to add a 'default' driver but that is a bit
> - * more work.
> - *
> - * FIXME: this has to be fixed for hotswap devices
> - */
> -
> - if(DRIVER(drive))
> - err = taskfile_lib_get_identify(drive, page);
> - else /* This relies on the ID changes */
> - val = (unsigned short *)drive->id;
> -
> + err = taskfile_lib_get_identify(drive, page);
> if(!err)
> {
> char *out = ((char *)page) + (SECTOR_WORDS * 4);