Skip to contentSkip to conversation

PATCH: minor IDE clean up I noticed

PATCH Alan Cox 2 participants 2 messages Sep 30, 2004 libata

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

Nowdays a drive always has a driver

drivers/ide/ide-proc.c +1 -14
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
@@ -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);
#1 lore raw

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

Quoted 28 lines · Alan Cox

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

drivers/ide/ide-proc.c +1 -14
@@ -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);