Merge with 2.1.56 as first part of merging back my code.

2 files changed, 1 insertions, 37 deletions

diff --git a/arch/alpha/kernel/bios32.c b/arch/alpha/kernel/bios32.c
index 385fc9494..851d33be7 100644
--- a/arch/alpha/kernel/bios32.c
+++ b/arch/alpha/kernel/bios32.c
@@ -1182,32 +1182,6 @@ unsigned long pcibios_fixup(unsigned long mem_start, unsigned long mem_end)
 }
 
 
-const char *pcibios_strerror (int error)
-{
-	static char buf[80];
-
-	switch (error) {
-		case PCIBIOS_SUCCESSFUL:
-			return "SUCCESSFUL";
-
-		case PCIBIOS_FUNC_NOT_SUPPORTED:
-			return "FUNC_NOT_SUPPORTED";
-
-		case PCIBIOS_BAD_VENDOR_ID:
-			return "SUCCESSFUL";
-
-		case PCIBIOS_DEVICE_NOT_FOUND:
-			return "DEVICE_NOT_FOUND";
-
-		case PCIBIOS_BAD_REGISTER_NUMBER:
-			return "BAD_REGISTER_NUMBER";
-
-		default:
-			sprintf (buf, "UNKNOWN RETURN 0x%x", error);
-			return buf;
-	}
-}
-
 asmlinkage int sys_pciconfig_read(
 	unsigned long bus,
 	unsigned long dfn,
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index f725e2aba..a736704a0 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -135,8 +135,6 @@ asmlinkage int osf_getdirentries(unsigned int fd, struct osf_dirent *dirent,
 {
 	int error;
 	struct file *file;
-	struct dentry *dentry;
-	struct inode *inode;
 	struct osf_dirent_callback buf;
 
 	error = -EBADF;
@@ -147,14 +145,6 @@ asmlinkage int osf_getdirentries(unsigned int fd, struct osf_dirent *dirent,
 	if (!file)
 		goto out;
 
-	dentry = file->f_dentry;
-	if (!dentry)
-		goto out;
-
-	inode = dentry->d_inode;
-	if (!inode)
-		goto out;
-
 	buf.dirent = dirent;
 	buf.basep = basep;
 	buf.count = count;
@@ -164,7 +154,7 @@ asmlinkage int osf_getdirentries(unsigned int fd, struct osf_dirent *dirent,
 	if (!file->f_op || !file->f_op->readdir)
 		goto out;
 
-	error = file->f_op->readdir(inode, file, &buf, osf_filldir);
+	error = file->f_op->readdir(file, &buf, osf_filldir);
 	if (error < 0)
 		goto out;