mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
ALSA: asihpi: Use CONFIG_64BIT directly
Signed-off-by: Eliot Blennerhassett <eliot@blennerhassett.gen.nz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
35a8dc1f66
commit
e51c58c982
2 changed files with 10 additions and 10 deletions
|
@ -554,17 +554,21 @@ struct hpi_pci {
|
|||
struct pci_dev *pci_dev;
|
||||
};
|
||||
|
||||
/** Adapter specification resource */
|
||||
struct hpi_adapter_specification {
|
||||
u32 type;
|
||||
u8 modules[4];
|
||||
};
|
||||
|
||||
struct hpi_resource {
|
||||
union {
|
||||
const struct hpi_pci *pci;
|
||||
const char *net_if;
|
||||
struct hpi_adapter_specification adapter_spec;
|
||||
const void *sw_if;
|
||||
} r;
|
||||
#ifndef HPI64BIT /* keep structure size constant */
|
||||
u32 pad_to64;
|
||||
#endif
|
||||
u16 bus_type; /* HPI_BUS_PNPISA, _PCI, _USB etc */
|
||||
u16 padding;
|
||||
|
||||
};
|
||||
|
||||
/** Format info used inside struct hpi_message
|
||||
|
@ -582,7 +586,7 @@ struct hpi_msg_format {
|
|||
struct hpi_msg_data {
|
||||
struct hpi_msg_format format;
|
||||
u8 *pb_data;
|
||||
#ifndef HPI64BIT
|
||||
#ifndef CONFIG_64BIT
|
||||
u32 padding;
|
||||
#endif
|
||||
u32 data_size;
|
||||
|
@ -595,7 +599,7 @@ struct hpi_data_legacy32 {
|
|||
u32 data_size;
|
||||
};
|
||||
|
||||
#ifdef HPI64BIT
|
||||
#ifdef CONFIG_64BIT
|
||||
/* Compatibility version of struct hpi_data*/
|
||||
struct hpi_data_compat32 {
|
||||
struct hpi_msg_format format;
|
||||
|
|
|
@ -41,10 +41,6 @@ HPI Operating System Specific macros for Linux Kernel driver
|
|||
|
||||
#define HPI_NO_OS_FILE_OPS
|
||||
|
||||
#ifdef CONFIG_64BIT
|
||||
#define HPI64BIT
|
||||
#endif
|
||||
|
||||
/** Details of a memory area allocated with pci_alloc_consistent
|
||||
Need all info for parameters to pci_free_consistent
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue