Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42258dab authored by Eliot Blennerhassett's avatar Eliot Blennerhassett Committed by Takashi Iwai
Browse files

ALSA: asihpi: Minor cleanups 



Remove some unneeded defintions
Use %pR to print resources
Make some data const
Consistent braces for else

Signed-off-by: default avatarEliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6d0b898e

sound/pci/asihpi/hpi_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -1583,9 +1583,7 @@ void hpi_stream_response_to_legacy(struct hpi_stream_res *pSR); 


/*////////////////////////////////////////////////////////////////////////// */

/* declarations for individual HPI entry points */

hpi_handler_func HPI_1000;

hpi_handler_func HPI_6000;

hpi_handler_func HPI_6205;

hpi_handler_func HPI_COMMON;



#endif				/* _HPI_INTERNAL_H_ */

sound/pci/asihpi/hpicmn.c

+7 −2
Original line number Diff line number Diff line
@@ -227,8 +227,9 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC) 
			if (info->control_type) {

				pC->p_info[info->control_index] = info;

				cached++;

			} else	/* dummy cache entry */

			} else {	/* dummy cache entry */

				pC->p_info[info->control_index] = NULL;

			}



			byte_count += info->size_in32bit_words * 4;
@@ -298,7 +299,7 @@ struct pad_ofs_size { 
	unsigned int field_size;

};



static struct pad_ofs_size pad_desc[] = {

static const struct pad_ofs_size pad_desc[] = {

	HPICMN_PAD_OFS_AND_SIZE(c_channel),	/* HPI_PAD_CHANNEL_NAME */

	HPICMN_PAD_OFS_AND_SIZE(c_artist),	/* HPI_PAD_ARTIST */

	HPICMN_PAD_OFS_AND_SIZE(c_title),	/* HPI_PAD_TITLE */
@@ -617,6 +618,10 @@ void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *p_cache, 
	}

}



/** Allocate control cache.



\return Cache pointer, or NULL if allocation fails.

*/

struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,

	const u32 size_in_bytes, u8 *p_dsp_control_buffer)

{

sound/pci/asihpi/hpicmn.h

+2 −0
Original line number Diff line number Diff line
@@ -60,3 +60,5 @@ void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *pC, 
	struct hpi_message *phm, struct hpi_response *phr);



u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr);



hpi_handler_func HPI_COMMON;

sound/pci/asihpi/hpioctl.c

+3 −6
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,

	const struct pci_device_id *pci_id)

{

	int err, idx, nm;

	int idx, nm;

	unsigned int memlen;

	struct hpi_message hm;

	struct hpi_response hr;
@@ -351,11 +351,8 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev, 
	nm = HPI_MAX_ADAPTER_MEM_SPACES;



	for (idx = 0; idx < nm; idx++) {

		HPI_DEBUG_LOG(INFO, "resource %d %s %08llx-%08llx %04llx\n",

			idx, pci_dev->resource[idx].name,

			(unsigned long long)pci_resource_start(pci_dev, idx),

			(unsigned long long)pci_resource_end(pci_dev, idx),

			(unsigned long long)pci_resource_flags(pci_dev, idx));

		HPI_DEBUG_LOG(INFO, "resource %d %pR\n", idx,

			&pci_dev->resource[idx]);



		if (pci_resource_flags(pci_dev, idx) & IORESOURCE_MEM) {

			memlen = pci_resource_len(pci_dev, idx);