sparc: Kill prom devops_{32,64}.c (b1482469) · Commits · e / devices / android_kernel_teracube_2e

arch/sparc/include/asm/oplib_32.h

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -60,25 +60,6 @@ extern char *prom_getbootargs(void);
	extern char prom_mapio(char virt_hint, int io_space, unsigned int phys_addr, unsigned int num_bytes);		extern char prom_mapio(char virt_hint, int io_space, unsigned int phys_addr, unsigned int num_bytes);
	extern void prom_unmapio(char *virt_addr, unsigned int num_bytes);		extern void prom_unmapio(char *virt_addr, unsigned int num_bytes);

	/* Device operations. */

	/* Open the device described by the passed string. Note, that the format
	* of the string is different on V0 vs. V2->higher proms. The caller must
	* know what he/she is doing! Returns the device descriptor, an int.
	*/
	extern int prom_devopen(char *device_string);

	/* Close a previously opened device described by the passed integer
	* descriptor.
	*/
	extern int prom_devclose(int device_handle);

	/* Do a seek operation on the device described by the passed integer
	* descriptor.
	*/
	extern void prom_seek(int device_handle, unsigned int seek_hival,
	unsigned int seek_lowval);

	/* Miscellaneous routines, don't really fit in any category per se. */		/* Miscellaneous routines, don't really fit in any category per se. */

	/* Reboot the machine with the command line passed. */		/* Reboot the machine with the command line passed. */

arch/sparc/include/asm/oplib_64.h

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -67,27 +67,6 @@ extern void prom_init(void cif_handler, void cif_stack);
	/* Boot argument acquisition, returns the boot command line string. */		/* Boot argument acquisition, returns the boot command line string. */
	extern char *prom_getbootargs(void);		extern char *prom_getbootargs(void);

	/* Device utilities. */

	/* Device operations. */

	/* Open the device described by the passed string. Note, that the format
	* of the string is different on V0 vs. V2->higher proms. The caller must
	* know what he/she is doing! Returns the device descriptor, an int.
	*/
	extern int prom_devopen(const char *device_string);

	/* Close a previously opened device described by the passed integer
	* descriptor.
	*/
	extern int prom_devclose(int device_handle);

	/* Do a seek operation on the device described by the passed integer
	* descriptor.
	*/
	extern void prom_seek(int device_handle, unsigned int seek_hival,
	unsigned int seek_lowval);

	/* Miscellaneous routines, don't really fit in any category per se. */		/* Miscellaneous routines, don't really fit in any category per se. */

	/* Reboot the machine with the command line passed. */		/* Reboot the machine with the command line passed. */

arch/sparc/prom/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,6 @@ ccflags := -Werror

	lib-y := bootstr_$(BITS).o		lib-y := bootstr_$(BITS).o
	lib-$(CONFIG_SPARC32) += devmap.o		lib-$(CONFIG_SPARC32) += devmap.o
	lib-y += devops_$(BITS).o
	lib-y += init_$(BITS).o		lib-y += init_$(BITS).o
	lib-$(CONFIG_SPARC32) += memory.o		lib-$(CONFIG_SPARC32) += memory.o
	lib-y += misc_$(BITS).o		lib-y += misc_$(BITS).o

arch/sparc/prom/devops_32.c

deleted100644 → 0

+0 −87

Original line number	Original line	Diff line number	Diff line
	/*
	* devops.c: Device operations using the PROM.
	*
	* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
	*/
	#include <linux/types.h>
	#include <linux/kernel.h>
	#include <linux/sched.h>

	#include <asm/openprom.h>
	#include <asm/oplib.h>

	extern void restore_current(void);

	/* Open the device described by the string 'dstr'. Returns the handle
	* to that device used for subsequent operations on that device.
	* Returns -1 on failure.
	*/
	int
	prom_devopen(char *dstr)
	{
	int handle;
	unsigned long flags;
	spin_lock_irqsave(&prom_lock, flags);
	switch(prom_vers) {
	case PROM_V0:
	handle = (*(romvec->pv_v0devops.v0_devopen))(dstr);
	if(handle == 0) handle = -1;
	break;
	case PROM_V2:
	case PROM_V3:
	handle = (*(romvec->pv_v2devops.v2_dev_open))(dstr);
	break;
	default:
	handle = -1;
	break;
	};
	restore_current();
	spin_unlock_irqrestore(&prom_lock, flags);

	return handle;
	}

	/* Close the device described by device handle 'dhandle'. */
	int
	prom_devclose(int dhandle)
	{
	unsigned long flags;
	spin_lock_irqsave(&prom_lock, flags);
	switch(prom_vers) {
	case PROM_V0:
	(*(romvec->pv_v0devops.v0_devclose))(dhandle);
	break;
	case PROM_V2:
	case PROM_V3:
	(*(romvec->pv_v2devops.v2_dev_close))(dhandle);
	break;
	default:
	break;
	};
	restore_current();
	spin_unlock_irqrestore(&prom_lock, flags);
	return 0;
	}

	/* Seek to specified location described by 'seekhi' and 'seeklo'
	* for device 'dhandle'.
	*/
	void
	prom_seek(int dhandle, unsigned int seekhi, unsigned int seeklo)
	{
	unsigned long flags;
	spin_lock_irqsave(&prom_lock, flags);
	switch(prom_vers) {
	case PROM_V0:
	(*(romvec->pv_v0devops.v0_seekdev))(dhandle, seekhi, seeklo);
	break;
	case PROM_V2:
	case PROM_V3:
	(*(romvec->pv_v2devops.v2_dev_seek))(dhandle, seekhi, seeklo);
	break;
	default:
	break;
	};
	restore_current();
	spin_unlock_irqrestore(&prom_lock, flags);
	}

arch/sparc/prom/devops_64.c

deleted100644 → 0

+0 −67

Original line number	Original line	Diff line number	Diff line
	/*
	* devops.c: Device operations using the PROM.
	*
	* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
	* Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
	*/
	#include <linux/types.h>
	#include <linux/kernel.h>
	#include <linux/sched.h>

	#include <asm/openprom.h>
	#include <asm/oplib.h>

	/* Open the device described by the string 'dstr'. Returns the handle
	* to that device used for subsequent operations on that device.
	* Returns 0 on failure.
	*/
	int
	prom_devopen(const char *dstr)
	{
	unsigned long args[5];

	args[0] = (unsigned long) "open";
	args[1] = 1;
	args[2] = 1;
	args[3] = (unsigned long) dstr;
	args[4] = (unsigned long) -1;

	p1275_cmd_direct(args);

	return (int) args[4];
	}

	/* Close the device described by device handle 'dhandle'. */
	int
	prom_devclose(int dhandle)
	{
	unsigned long args[4];

	args[0] = (unsigned long) "close";
	args[1] = 1;
	args[2] = 0;
	args[3] = (unsigned int) dhandle;

	p1275_cmd_direct(args);

	return 0;
	}

	/* Seek to specified location described by 'seekhi' and 'seeklo'
	* for device 'dhandle'.
	*/
	void
	prom_seek(int dhandle, unsigned int seekhi, unsigned int seeklo)
	{
	unsigned long args[7];

	args[0] = (unsigned long) "seek";
	args[1] = 3;
	args[2] = 1;
	args[3] = (unsigned int) dhandle;
	args[4] = seekhi;
	args[5] = seeklo;
	args[6] = (unsigned long) -1;

	p1275_cmd_direct(args);
	}