Commit ec528652 authored by Felipe Contreras's avatar Felipe Contreras Committed by Greg Kroah-Hartman
Browse files

staging: ti dspbridge: remove unused code 



Signed-off-by: default avatarFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0d8631d2

drivers/staging/tidspbridge/core/_tiomap.h

+1 −5
Original line number Diff line number Diff line
@@ -340,10 +340,6 @@ struct bridge_dev_context { 
	/* DMMU TLB entries */

	struct bridge_ioctl_extproc atlb_entry[BRDIOCTL_NUMOFMMUTLB];

	u32 dw_brd_state;       /* Last known board state. */

	u32 ul_int_mask;	/* int mask */

	u16 io_base;		/* Board I/O base */

	u32 num_tlb_entries;	/* DSP MMU TLB entry counter */

	u32 fixed_tlb_entries;	/* Fixed DSPMMU TLB entry count */



	/* TC Settings */

	bool tc_word_swap_on;	/* Traffic Controller Word Swap */

drivers/staging/tidspbridge/core/tiomap3430.c

+0 −2
Original line number Diff line number Diff line
@@ -837,7 +837,6 @@ static int bridge_dev_create(OUT struct bridge_dev_context 
		dev_context->atlb_entry[entry_ndx].ul_gpp_pa =

		    dev_context->atlb_entry[entry_ndx].ul_dsp_va = 0;

	}

	dev_context->num_tlb_entries = 0;

	dev_context->dw_dsp_base_addr = (u32) MEM_LINEAR_ADDRESS((void *)

								 (pConfig->

								  dw_mem_base
@@ -940,7 +939,6 @@ static int bridge_dev_create(OUT struct bridge_dev_context 
	}

	if (DSP_SUCCEEDED(status)) {

		dev_context->hdev_obj = hdev_obj;

		dev_context->ul_int_mask = 0;

		/* Store current board state. */

		dev_context->dw_brd_state = BRD_STOPPED;

		dev_context->resources = resources;

drivers/staging/tidspbridge/core/ue_deh.c

+0 −17
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ int bridge_deh_destroy(struct deh_mgr *deh_mgr) 
	if (!deh_mgr)

		return -EFAULT;



	/* Release dummy VA buffer */

	bridge_deh_release_dummy_mem();

	/* If notification object exists, delete it */

	if (deh_mgr->ntfy_obj) {

		ntfy_delete(deh_mgr->ntfy_obj);
@@ -145,7 +143,6 @@ int bridge_deh_register_notify(struct deh_mgr *deh_mgr, u32 event_mask, 
void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo)

{

	struct bridge_dev_context *dev_context;

	u32 hw_mmu_max_tlb_count = 31;

	struct cfg_hostres *resources;

	struct hw_mmu_map_attrs_t map_attrs = {

		.endianism = HW_LITTLE_ENDIAN,
@@ -189,16 +186,6 @@ void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo) 
		print_dsp_trace_buffer(dev_context);

		dump_dl_modules(dev_context);



		/*

		 * Reset the dynamic mmu index to fixed count if it exceeds

		 * 31. So that the dynmmuindex is always between the range of

		 * standard/fixed entries and 31.

		 */

		if (dev_context->num_tlb_entries >

				hw_mmu_max_tlb_count) {

			dev_context->num_tlb_entries =

				dev_context->fixed_tlb_entries;

		}

		hw_mmu_tlb_add(resources->dw_dmmu_base,

				virt_to_phys(dummy_va_addr), fault_addr,

				HW_PAGE_SIZE4KB, 1,
@@ -275,7 +262,3 @@ int bridge_deh_get_info(struct deh_mgr *deh_mgr, 


	return 0;

}
 


void bridge_deh_release_dummy_mem(void)

{

}

drivers/staging/tidspbridge/include/dspbridge/dspdeh.h

+0 −1
Original line number Diff line number Diff line
@@ -43,5 +43,4 @@ extern int bridge_deh_register_notify(struct deh_mgr *deh_mgr, 
extern void bridge_deh_notify(struct deh_mgr *deh_mgr,

		u32 ulEventMask, u32 dwErrInfo);



extern void bridge_deh_release_dummy_mem(void);

#endif /* DSPDEH_ */

drivers/staging/tidspbridge/rmgr/proc.c

+0 −5
Original line number Diff line number Diff line
@@ -1632,11 +1632,6 @@ int proc_stop(void *hprocessor) 
		status = -EFAULT;

		goto func_end;

	}

	if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_brd_status)

			  (p_proc_object->hbridge_context, &brd_state))) {

		if (brd_state == BRD_ERROR)

			bridge_deh_release_dummy_mem();

	}

	/* check if there are any running nodes */

	status = dev_get_node_manager(p_proc_object->hdev_obj, &hnode_mgr);

	if (DSP_SUCCEEDED(status) && hnode_mgr) {