Skip to contentSkip to conversation

2.5.30 IDE 112

PATCH In review Marcin Dalecki 3 participants 3 messages Aug 6, 2002

lore
Share & tools
lore

Marcin Dalecki

author
#0 lore raw

PATCH 1/1 2.5.30 IDE 112

- Just removaing dead obscure xlate_1024 code.

drivers/ide/cs5530.c +1 -3
diff -durNp -X /tmp/diff.uRHk8V linux-2.5.30/drivers/ide/cs5530.c linux/drivers/ide/cs5530.c
@@ -204,8 +204,6 @@ static unsigned int __init pci_init_cs55
 {
 	struct pci_dev *master_0 = NULL;
 	struct pci_dev *cs5530_0 = NULL;
-	unsigned short pcicmd = 0;
-	unsigned long flags;
 
 	pci_for_each_dev(dev) {
 		if (dev->vendor == PCI_VENDOR_ID_CYRIX) {

@@ -233,7 +231,7 @@ static unsigned int __init pci_init_cs55
 	 * Enable BusMaster and MemoryWriteAndInvalidate for the cs5530:
 	 * -->  OR 0x14 into 16-bit PCI COMMAND reg of function 0 of the cs5530
 	 */
-	 
+
 	pci_set_master(cs5530_0);
 	pci_set_mwi(cs5530_0);
drivers/ide/ide.c +1 -1
diff -durNp -X /tmp/diff.uRHk8V linux-2.5.30/drivers/ide/ide.c linux/drivers/ide/ide.c
@@ -251,7 +251,7 @@ static struct ata_bit_messages ata_statu
 
 static struct ata_bit_messages ata_error_msgs[] = {
 	{ ICRC_ERR|ABRT_ERR,	ABRT_ERR,		"drive status error"	},
-	{ ICRC_ERR|ABRT_ERR,	ICRC_ERR,		"bad sectorr"		},
+	{ ICRC_ERR|ABRT_ERR,	ICRC_ERR,		"bad sector"		},
 	{ ICRC_ERR|ABRT_ERR,	ICRC_ERR|ABRT_ERR,	"invalid checksum"	},
 	{ ECC_ERR,		ECC_ERR,		"uncorrectable error"	},
 	{ ID_ERR,		ID_ERR,			"sector id not found"   },
drivers/ide/Makefile +4 -7
diff -durNp -X /tmp/diff.uRHk8V linux-2.5.30/drivers/ide/Makefile linux/drivers/ide/Makefile
@@ -1,15 +1,12 @@
 #
-# Makefile for the kernel ata, atapi, and ide block device drivers.
+# Makefile for the kernel ata and atapi block device drivers.
 #
-# 12 September 2000, Bartlomiej Zolnierkiewicz <[email protected]>
+# 12 September 2000, Bartłomiej Żołnierkiewicz <[email protected]>
 # Rewritten to use lists instead of if-statements.
 #
-# Note : at this point, these files are compiled on all systems.
-# In the future, some of these should be built conditionally.
-#
 
-export-objs	:= device.o ide-taskfile.o main.o ide.o probe.o quirks.o pcidma.o tcq.o \
-		   atapi.o ataraid.o
+export-objs :=	device.o ide-taskfile.o main.o ide.o probe.o quirks.o \
+		pcidma.o tcq.o atapi.o ataraid.o
 
 obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
 obj-$(CONFIG_BLK_DEV_IDE)       += ide-mod.o
drivers/ide/probe.c +0 -109

115 lines not on this page · raw message

drivers/ide/qd65xx.c +45 -41

149 lines not on this page · raw message

fs/partitions/Makefile +1 -1
diff -durNp -X /tmp/diff.uRHk8V linux-2.5.30/fs/partitions/Makefile linux/fs/partitions/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-export-objs := check.o msdos.o
+export-objs := check.o
 
 obj-y := check.o
fs/partitions/msdos.c +0 -11
diff -durNp -X /tmp/diff.uRHk8V linux-2.5.30/fs/partitions/msdos.c linux/fs/partitions/msdos.c
@@ -22,17 +22,6 @@
 #include <linux/config.h>
 #include <linux/buffer_head.h>		/* for invalidate_bdev() */
 
-#ifdef CONFIG_BLK_DEV_IDE
-#include <linux/hdreg.h>
-#include <linux/ide.h>	/* IDE xlate */
-#elif defined(CONFIG_BLK_DEV_IDE_MODULE)
-#include <linux/module.h>
-
-int (*ide_xlate_1024_hook)(kdev_t, int, int, const char *);
-EXPORT_SYMBOL(ide_xlate_1024_hook);
-#define ide_xlate_1024 ide_xlate_1024_hook
-#endif
-
 #include "check.h"
 #include "msdos.h"
 #include "efi.h"
include/linux/ide.h +0 -6
diff -durNp -X /tmp/diff.uRHk8V linux-2.5.30/include/linux/ide.h linux/include/linux/ide.h
@@ -1091,12 +1091,6 @@ extern ide_startstop_t ata_error(struct 
 extern void ide_fixstring(char *s, const int bytecount, const int byteswap);
 
 /*
- * This routine is called from the partition-table code in genhd.c
- * to "convert" a drive to a logical geometry with fewer than 1024 cyls.
- */
-int ide_xlate_1024(kdev_t, int, int, const char *);
-
-/*
  * Convert kdev_t structure into struct ata_device * one.
  */
 struct ata_device *get_info_ptr(kdev_t i_rdev);
#1 lore raw
Quoted 1 line · Marcin Dalecki

- Just removaing dead obscure xlate_1024 code.

Hmm. You have a somewhat literal idea of "dead": code that is not called today, regardless of whether it was called yesterday and will be needed tomorrow.

Just plain removing everything keeps the source clean but has the unpleasant side effect that Linux no longer works on certain machines.

Command line options must be added to ask for what this xlate_1024 code did earlier. So, some fragments of what you remove in this patch will have to come back in some form.

Andries

#2 lore raw
In reply to Marcin Dalecki
Quoted 2 lines · Marcin Dalecki

- Just removaing dead obscure xlate_1024 code.

I would actually suggest you keep it.

People use it, and removing it will cause confusion. It's not pretty, but it works, and it doesn't mess up any other regular path.

Linus