ALSA: asihpi: Use CONFIG_64BIT directly (e51c58c9) · Commits · e / devices / android_kernel_teracube_2e

sound/pci/asihpi/hpi_internal.h

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -554,17 +554,21 @@ struct hpi_pci {
	struct pci_dev *pci_dev;		struct pci_dev *pci_dev;
	};		};

			/** Adapter specification resource */
			struct hpi_adapter_specification {
			u32 type;
			u8 modules[4];
			};

	struct hpi_resource {		struct hpi_resource {
	union {		union {
	const struct hpi_pci *pci;		const struct hpi_pci *pci;
	const char *net_if;		const char *net_if;
			struct hpi_adapter_specification adapter_spec;
			const void *sw_if;
	} r;		} r;
	#ifndef HPI64BIT /* keep structure size constant */
	u32 pad_to64;
	#endif
	u16 bus_type; /* HPI_BUS_PNPISA, _PCI, _USB etc */		u16 bus_type; /* HPI_BUS_PNPISA, _PCI, _USB etc */
	u16 padding;		u16 padding;

	};		};

	/** Format info used inside struct hpi_message		/** Format info used inside struct hpi_message
	@@ -582,7 +586,7 @@ struct hpi_msg_format {
	struct hpi_msg_data {		struct hpi_msg_data {
	struct hpi_msg_format format;		struct hpi_msg_format format;
	u8 *pb_data;		u8 *pb_data;
	#ifndef HPI64BIT		#ifndef CONFIG_64BIT
	u32 padding;		u32 padding;
	#endif		#endif
	u32 data_size;		u32 data_size;
	@@ -595,7 +599,7 @@ struct hpi_data_legacy32 {
	u32 data_size;		u32 data_size;
	};		};

	#ifdef HPI64BIT		#ifdef CONFIG_64BIT
	/* Compatibility version of struct hpi_data*/		/* Compatibility version of struct hpi_data*/
	struct hpi_data_compat32 {		struct hpi_data_compat32 {
	struct hpi_msg_format format;		struct hpi_msg_format format;

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -41,10 +41,6 @@ HPI Operating System Specific macros for Linux Kernel driver

	#define HPI_NO_OS_FILE_OPS		#define HPI_NO_OS_FILE_OPS

	#ifdef CONFIG_64BIT
	#define HPI64BIT
	#endif

	/** Details of a memory area allocated with pci_alloc_consistent		/** Details of a memory area allocated with pci_alloc_consistent
	Need all info for parameters to pci_free_consistent		Need all info for parameters to pci_free_consistent
	*/		*/