ALSA: asihpi - Remove unused structures, macros and functions (4bf8cff0) · Commits · e / devices / android_kernel_teracube_2e

sound/pci/asihpi/hpi6205.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -658,9 +658,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
	hr.u.ax.info.num_outstreams +		hr.u.ax.info.num_outstreams +
	hr.u.ax.info.num_instreams;		hr.u.ax.info.num_instreams;

	hpios_locked_mem_prepare((max_streams * 6) / 10, max_streams,
	65536, pao->pci.pci_dev);

	HPI_DEBUG_LOG(VERBOSE,		HPI_DEBUG_LOG(VERBOSE,
	"got adapter info type %x index %d serial %d\n",		"got adapter info type %x index %d serial %d\n",
	hr.u.ax.info.adapter_type, hr.u.ax.info.adapter_index,		hr.u.ax.info.adapter_type, hr.u.ax.info.adapter_index,
	@@ -709,9 +706,6 @@ static void delete_adapter_obj(struct hpi_adapter_obj *pao)
	[i]);		[i]);
	phw->outstream_host_buffer_size[i] = 0;		phw->outstream_host_buffer_size[i] = 0;
	}		}

	hpios_locked_mem_unprepare(pao->pci.pci_dev);

	kfree(phw);		kfree(phw);
	}		}

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -32,12 +32,6 @@ HPI internal definitions
	#include "hpios.h"		#include "hpios.h"

	/* physical memory allocation */		/* physical memory allocation */
	void hpios_locked_mem_init(void
	);
	void hpios_locked_mem_free_all(void
	);
	#define hpios_locked_mem_prepare(a, b, c, d);
	#define hpios_locked_mem_unprepare(a)

	/** Allocate and map an area of locked memory for bus master DMA operations.		/** Allocate and map an area of locked memory for bus master DMA operations.

	@@ -1431,12 +1425,6 @@ struct hpi_control_cache_microphone {
	char temp_padding[6];		char temp_padding[6];
	};		};

	struct hpi_control_cache_generic {
	struct hpi_control_cache_info i;
	u32 dw1;
	u32 dw2;
	};

	struct hpi_control_cache_single {		struct hpi_control_cache_single {
	union {		union {
	struct hpi_control_cache_info i;		struct hpi_control_cache_info i;
	@@ -1452,7 +1440,6 @@ struct hpi_control_cache_single {
	struct hpi_control_cache_silencedetector silence;		struct hpi_control_cache_silencedetector silence;
	struct hpi_control_cache_sampleclock clk;		struct hpi_control_cache_sampleclock clk;
	struct hpi_control_cache_microphone microphone;		struct hpi_control_cache_microphone microphone;
	struct hpi_control_cache_generic generic;
	} u;		} u;
	};		};

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,6 @@ struct dsp_code_private {
	#define HPI_VER_DECIMAL ((int)(HPI_VER_MAJOR(HPI_VER) * 10000 + \		#define HPI_VER_DECIMAL ((int)(HPI_VER_MAJOR(HPI_VER) * 10000 + \
	HPI_VER_MINOR(HPI_VER) * 100 + HPI_VER_RELEASE(HPI_VER)))		HPI_VER_MINOR(HPI_VER) * 100 + HPI_VER_RELEASE(HPI_VER)))

	#include <linux/pci.h>
	/-------------------------------------------------------------------/		/-------------------------------------------------------------------/
	short hpi_dsp_code_open(u32 adapter, void os_data, struct dsp_code dsp_code,		short hpi_dsp_code_open(u32 adapter, void os_data, struct dsp_code dsp_code,
	u32 *os_error_code)		u32 *os_error_code)

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -186,7 +186,6 @@ static void subsys_message(struct hpi_message phm, struct hpi_response phr,
	/* Initialize this module's internal state */		/* Initialize this module's internal state */
	hpios_msgxlock_init(&msgx_lock);		hpios_msgxlock_init(&msgx_lock);
	memset(&hpi_entry_points, 0, sizeof(hpi_entry_points));		memset(&hpi_entry_points, 0, sizeof(hpi_entry_points));
	hpios_locked_mem_init();
	/* Init subsys_findadapters response to no-adapters */		/* Init subsys_findadapters response to no-adapters */
	HPIMSGX__reset(HPIMSGX_ALLADAPTERS);		HPIMSGX__reset(HPIMSGX_ALLADAPTERS);
	hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,		hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,
	@@ -197,7 +196,6 @@ static void subsys_message(struct hpi_message phm, struct hpi_response phr,
	case HPI_SUBSYS_DRIVER_UNLOAD:		case HPI_SUBSYS_DRIVER_UNLOAD:
	HPI_COMMON(phm, phr);		HPI_COMMON(phm, phr);
	HPIMSGX__cleanup(HPIMSGX_ALLADAPTERS, h_owner);		HPIMSGX__cleanup(HPIMSGX_ALLADAPTERS, h_owner);
	hpios_locked_mem_free_all();
	hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,		hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,
	HPI_SUBSYS_DRIVER_UNLOAD, 0);		HPI_SUBSYS_DRIVER_UNLOAD, 0);
	return;		return;

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -39,10 +39,6 @@ void hpios_delay_micro_seconds(u32 num_micro_sec)

	}		}

	void hpios_locked_mem_init(void)
	{
	}

	/** Allocated an area of locked memory for bus master DMA operations.		/** Allocated an area of locked memory for bus master DMA operations.

	On error, return -ENOMEM, and *pMemArea.size = 0		On error, return -ENOMEM, and *pMemArea.size = 0
	@@ -85,7 +81,3 @@ u16 hpios_locked_mem_free(struct consistent_dma_area *p_mem_area)
	return 1;		return 1;
	}		}
	}		}

	void hpios_locked_mem_free_all(void)
	{
	}