From Rusty.
The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6. Gcc has always supported
both forms anyway.
(rmk - cleaned up spacing to be more reasonable)
}
static struct dma_ops isa_dma_ops = {
- type: "ISA",
- enable: isa_enable_dma,
- disable: isa_disable_dma,
- residue: isa_get_dma_residue,
+ .type = "ISA",
+ .enable = isa_enable_dma,
+ .disable = isa_disable_dma,
+ .residue = isa_get_dma_residue,
};
static struct resource dma_resources[] = {
}
static struct notifier_block ecard_reboot_notifier = {
- notifier_call: ecard_reboot,
+ .notifier_call = ecard_reboot,
};
}
static struct irqchip ecard_chip = {
- ack: ecard_irq_mask,
- mask: ecard_irq_mask,
- unmask: ecard_irq_unmask,
+ .ack = ecard_irq_mask,
+ .mask = ecard_irq_mask,
+ .unmask = ecard_irq_unmask,
};
void ecard_enablefiq(unsigned int fiqnr)
}
static struct fiq_handler default_owner = {
- name: "default",
- fiq_op: fiq_def_op,
+ .name = "default",
+ .fiq_op = fiq_def_op,
};
static struct fiq_handler *current_fiq = &default_owner;
}
static struct irqchip bad_chip = {
- ack: dummy_mask_unmask_irq,
- mask: dummy_mask_unmask_irq,
- unmask: dummy_mask_unmask_irq,
+ .ack = dummy_mask_unmask_irq,
+ .mask = dummy_mask_unmask_irq,
+ .unmask = dummy_mask_unmask_irq,
};
static struct irqdesc bad_irq_desc = {
- chip: &bad_chip,
- handle: do_bad_IRQ,
- depth: 1,
+ .chip = &bad_chip,
+ .handle = do_bad_IRQ,
+ .depth = 1,
};
/**
}
struct seq_operations cpuinfo_op = {
- start: c_start,
- next: c_next,
- stop: c_stop,
- show: c_show
+ .start = c_start,
+ .next = c_next,
+ .stop = c_stop,
+ .show = c_show
};
}
static struct irqaction timer_irq = {
- name: "timer",
+ .name = "timer",
};
/*
}
static struct irqaction anakin_irq = {
- name: "Anakin IRQ",
- handler: anakin_interrupt,
- flags: SA_INTERRUPT
+ .name = "Anakin IRQ",
+ .handler = anakin_interrupt,
+ .flags = SA_INTERRUPT
};
void __init
}
static struct dma_ops arc_floppy_data_dma_ops = {
- type: "FIQDMA",
- enable: arc_floppy_data_enable_dma,
- disable: arc_disable_dma,
- residue: arc_floppy_data_get_dma_residue,
+ .type = "FIQDMA",
+ .enable = arc_floppy_data_enable_dma,
+ .disable = arc_disable_dma,
+ .residue = arc_floppy_data_get_dma_residue,
};
static struct dma_ops arc_floppy_cmdend_dma_ops = {
- type: "FIQCMD",
- enable: arc_floppy_cmdend_enable_dma,
- disable: arc_disable_dma,
- residue: arc_floppy_cmdend_get_dma_residue,
+ .type = "FIQCMD",
+ .enable = arc_floppy_cmdend_enable_dma,
+ .disable = arc_disable_dma,
+ .residue = arc_floppy_cmdend_get_dma_residue,
};
#endif
#ifdef CONFIG_ARCH_A5K
static struct fiq_handler fh = {
- name: "floppydata"
+ .name = "floppydata"
};
static int a5k_floppy_get_dma_residue(dmach_t channel, dma_t *dma)
}
static struct dma_ops a5k_floppy_dma_ops = {
- type: "FIQDMA",
- enable: a5k_floppy_enable_dma,
- disable: a5k_floppy_disable_dma,
- residue: a5k_floppy_get_dma_residue,
+ .type = "FIQDMA",
+ .enable = a5k_floppy_enable_dma,
+ .disable = a5k_floppy_disable_dma,
+ .residue = a5k_floppy_get_dma_residue,
};
#endif
}
static struct dma_ops sound_dma_ops = {
- type: "VIRTUAL",
- enable: sound_enable_disable_dma,
- disable: sound_enable_disable_dma,
+ .type = "VIRTUAL",
+ .enable = sound_enable_disable_dma,
+ .disable = sound_enable_disable_dma,
};
void __init arch_dma_init(dma_t *dma)
}
static struct irqchip int1_chip = {
- ack: int1_ack,
- mask: int1_mask,
- unmask: int1_unmask,
+ .ack = int1_ack,
+ .mask = int1_mask,
+ .unmask = int1_unmask,
};
static void int2_mask(unsigned int irq)
}
static struct irqchip int2_chip = {
- ack: int2_ack,
- mask: int2_mask,
- unmask: int2_unmask,
+ .ack = int2_ack,
+ .mask = int2_mask,
+ .unmask = int2_unmask,
};
void __init clps711x_init_irq(void)
}
static struct irqchip ebsa110_irq_chip = {
- ack: ebsa110_mask_irq,
- mask: ebsa110_mask_irq,
- unmask: ebsa110_unmask_irq,
+ .ack = ebsa110_mask_irq,
+ .mask = ebsa110_mask_irq,
+ .unmask = ebsa110_unmask_irq,
};
static void __init ebsa110_init_irq(void)
static struct irqchip epxa_irq_chip = {
- ack: epxa_mask_irq,
- mask: epxa_mask_irq,
- unmask: epxa_unmask_irq,
+ .ack = epxa_mask_irq,
+ .mask = epxa_mask_irq,
+ .unmask = epxa_unmask_irq,
};
static struct resource irq_resource = {
- name: "irq_handler",
- start: IO_ADDRESS(EXC_INT_CTRL00_BASE),
- end: IO_ADDRESS(INT_PRIORITY_FC(EXC_INT_CTRL00_BASE))+4,
+ .name = "irq_handler",
+ .start = IO_ADDRESS(EXC_INT_CTRL00_BASE),
+ .end = IO_ADDRESS(INT_PRIORITY_FC(EXC_INT_CTRL00_BASE))+4,
};
void __init epxa10db_init_irq(void)
* cards being used (ie, pci-pci bridge based cards)?
*/
static struct hw_pci cats_pci __initdata = {
- swizzle: NULL,
- map_irq: cats_map_irq,
- nr_controllers: 1,
- setup: dc21285_setup,
- scan: dc21285_scan_bus,
- preinit: dc21285_preinit,
- postinit: dc21285_postinit,
+ .swizzle = NULL,
+ .map_irq = cats_map_irq,
+ .nr_controllers = 1,
+ .setup = dc21285_setup,
+ .scan = dc21285_scan_bus,
+ .preinit = dc21285_preinit,
+ .postinit = dc21285_postinit,
};
static int cats_pci_init(void)
}
static struct dma_ops fb_dma_ops = {
- type: "fb",
- request: fb_dma_request,
- enable: fb_dma_enable,
- disable: fb_dma_disable,
+ .type = "fb",
+ .request = fb_dma_request,
+ .enable = fb_dma_enable,
+ .disable = fb_dma_disable,
};
#endif
}
static struct hw_pci ebsa285_pci __initdata = {
- swizzle: pci_std_swizzle,
- map_irq: ebsa285_map_irq,
- nr_controllers: 1,
- setup: dc21285_setup,
- scan: dc21285_scan_bus,
- preinit: dc21285_preinit,
- postinit: dc21285_postinit,
+ .swizzle = pci_std_swizzle,
+ .map_irq = ebsa285_map_irq,
+ .nr_controllers = 1,
+ .setup = dc21285_setup,
+ .scan = dc21285_scan_bus,
+ .preinit = dc21285_preinit,
+ .postinit = dc21285_postinit,
};
static int __init ebsa285_init_pci(void)
}
static struct irqchip fb_chip = {
- ack: fb_mask_irq,
- mask: fb_mask_irq,
- unmask: fb_unmask_irq,
+ .ack = fb_mask_irq,
+ .mask = fb_mask_irq,
+ .unmask = fb_unmask_irq,
};
static void __init __fb_init_irq(void)
}
static struct irqchip isa_lo_chip = {
- ack: isa_ack_pic_lo_irq,
- mask: isa_mask_pic_lo_irq,
- unmask: isa_unmask_pic_lo_irq,
+ .ack = isa_ack_pic_lo_irq,
+ .mask = isa_mask_pic_lo_irq,
+ .unmask = isa_unmask_pic_lo_irq,
};
static void isa_mask_pic_hi_irq(unsigned int irq)
}
static struct irqchip isa_hi_chip = {
- ack: isa_ack_pic_hi_irq,
- mask: isa_mask_pic_hi_irq,
- unmask: isa_unmask_pic_hi_irq,
+ .ack = isa_ack_pic_hi_irq,
+ .mask = isa_mask_pic_hi_irq,
+ .unmask = isa_unmask_pic_hi_irq,
};
static void no_action(int irq, void *dev_id, struct pt_regs *regs)
}
static struct hw_pci netwinder_pci __initdata = {
- swizzle: pci_std_swizzle,
- map_irq: netwinder_map_irq,
- nr_controllers: 1,
- setup: dc21285_setup,
- scan: dc21285_scan_bus,
- preinit: dc21285_preinit,
- postinit: dc21285_postinit,
+ .swizzle = pci_std_swizzle,
+ .map_irq = netwinder_map_irq,
+ .nr_controllers = 1,
+ .setup = dc21285_setup,
+ .scan = dc21285_scan_bus,
+ .preinit = dc21285_preinit,
+ .postinit = dc21285_postinit,
};
static int __init netwinder_pci_init(void)
}
static struct hw_pci personal_server_pci __initdata = {
- map_irq: personal_server_map_irq,
- nr_controllers: 1,
- setup: dc21285_setup,
- scan: dc21285_scan_bus,
- preinit: dc21285_preinit,
- postinit: dc21285_postinit,
+ .map_irq = personal_server_map_irq,
+ .nr_controllers = 1,
+ .setup = dc21285_setup,
+ .scan = dc21285_scan_bus,
+ .preinit = dc21285_preinit,
+ .postinit = dc21285_postinit,
};
static int __init personal_pci_init(void)
/* ftv host-specific stuff */
static struct hw_pci ftv_pci __initdata = {
- init: plx90x0_init,
- swizzle: ftv_swizzle,
- map_irq: ftv_map_irq,
+ .init = plx90x0_init,
+ .swizzle = ftv_swizzle,
+ .map_irq = ftv_map_irq,
};
static int __init ftv_pci_init(void)
#ifdef CONFIG_KMI_KEYB
static struct kmi_info integrator_keyboard __initdata = {
- base: IO_ADDRESS(KMI0_BASE),
- irq: IRQ_KMIINT0,
- divisor: 24 / 8 - 1,
- type: KMI_KEYBOARD,
+ .base = IO_ADDRESS(KMI0_BASE),
+ .irq = IRQ_KMIINT0,
+ .divisor = 24 / 8 - 1,
+ .type = KMI_KEYBOARD,
};
static struct kmi_info integrator_mouse __initdata = {
- base: IO_ADDRESS(KMI1_BASE),
- irq: IRQ_KMIINT1,
- divisor: 24 / 8 - 1,
- type: KMI_MOUSE,
+ .base = IO_ADDRESS(KMI1_BASE),
+ .irq = IRQ_KMIINT1,
+ .divisor = 24 / 8 - 1,
+ .type = KMI_MOUSE,
};
#endif
}
static struct irqchip sc_chip = {
- ack: sc_mask_irq,
- mask: sc_mask_irq,
- unmask: sc_unmask_irq,
+ .ack = sc_mask_irq,
+ .mask = sc_mask_irq,
+ .unmask = sc_unmask_irq,
};
void __init integrator_init_irq(void)
extern void pci_v3_init(void *);
static struct hw_pci integrator_pci __initdata = {
- swizzle: integrator_swizzle,
- map_irq: integrator_map_irq,
- setup: pci_v3_setup,
- nr_controllers: 1,
- scan: pci_v3_scan_bus,
- preinit: pci_v3_preinit,
- postinit: pci_v3_postinit,
+ .swizzle = integrator_swizzle,
+ .map_irq = integrator_map_irq,
+ .setup = pci_v3_setup,
+ .nr_controllers = 1,
+ .scan = pci_v3_scan_bus,
+ .preinit = pci_v3_preinit,
+ .postinit = pci_v3_postinit,
};
static int __init integrator_pci_init(void)
}
static struct pci_ops pci_v3_ops = {
- read_byte: v3_read_config_byte,
- read_word: v3_read_config_word,
- read_dword: v3_read_config_dword,
- write_byte: v3_write_config_byte,
- write_word: v3_write_config_word,
- write_dword: v3_write_config_dword,
+ .read_byte = v3_read_config_byte,
+ .read_word = v3_read_config_word,
+ .read_dword = v3_read_config_dword,
+ .write_byte = v3_write_config_byte,
+ .write_word = v3_write_config_word,
+ .write_dword = v3_write_config_dword,
};
static struct resource non_mem = {
- name: "PCI non-prefetchable",
- start: PHYS_PCI_MEM_BASE + PCI_BUS_NONMEM_START,
- end: PHYS_PCI_MEM_BASE + PCI_BUS_NONMEM_START + PCI_BUS_NONMEM_SIZE - 1,
- flags: IORESOURCE_MEM,
+ .name = "PCI non-prefetchable",
+ .start = PHYS_PCI_MEM_BASE + PCI_BUS_NONMEM_START,
+ .end = PHYS_PCI_MEM_BASE + PCI_BUS_NONMEM_START + PCI_BUS_NONMEM_SIZE - 1,
+ .flags = IORESOURCE_MEM,
};
static struct resource pre_mem = {
- name: "PCI prefetchable",
- start: PHYS_PCI_MEM_BASE + PCI_BUS_PREMEM_START,
- end: PHYS_PCI_MEM_BASE + PCI_BUS_PREMEM_START + PCI_BUS_PREMEM_SIZE - 1,
- flags: IORESOURCE_MEM | IORESOURCE_PREFETCH,
+ .name = "PCI prefetchable",
+ .start = PHYS_PCI_MEM_BASE + PCI_BUS_PREMEM_START,
+ .end = PHYS_PCI_MEM_BASE + PCI_BUS_PREMEM_START + PCI_BUS_PREMEM_SIZE - 1,
+ .flags = IORESOURCE_MEM | IORESOURCE_PREFETCH,
};
static int __init pci_v3_setup_resources(struct resource **resource)
}
struct irqchip ext_chip = {
- ack: iop310_irq_mask,
- mask: iop310_irq_mask,
- unmask: iop310_irq_unmask,
+ .ack = iop310_irq_mask,
+ .mask = iop310_irq_mask,
+ .unmask = iop310_irq_unmask,
};
void
}
static struct irqchip iq80310_irq_chip = {
- ack: iq80310_irq_mask,
- mask: iq80310_irq_mask,
- unmask: iq80310_irq_unmask,
+ .ack = iq80310_irq_mask,
+ .mask = iq80310_irq_mask,
+ .unmask = iq80310_irq_unmask,
};
extern struct irqchip ext_chip;
}
static struct hw_pci iq80310_pci __initdata = {
- swizzle: pci_std_swizzle,
- nr_controllers: 2,
- setup: iq80310_setup,
- scan: iop310_scan_bus,
- preinit: iq80310_preinit,
+ .swizzle = pci_std_swizzle,
+ .nr_controllers = 2,
+ .setup = iq80310_setup,
+ .scan = iop310_scan_bus,
+ .preinit = iq80310_preinit,
};
static int __init iq80310_pci_init(void)
extern unsigned long (*gettimeoffset)(void);
static struct irqaction timer_irq = {
- name: "timer",
- handler: iq80310_timer_interrupt,
+ .name = "timer",
+ .handler = iq80310_timer_interrupt,
};
}
static struct irqchip xs80200_chip = {
- ack: xs80200_irq_mask,
- mask: xs80200_irq_mask,
- unmask: xs80200_irq_unmask,
+ .ack = xs80200_irq_mask,
+ .mask = xs80200_irq_mask,
+ .unmask = xs80200_irq_unmask,
};
void __init xs80200_init_irq(void)
}
static struct irqchip pxa_internal_chip = {
- ack: pxa_mask_irq,
- mask: pxa_mask_irq,
- unmask: pxa_unmask_irq,
+ .ack = pxa_mask_irq,
+ .mask = pxa_mask_irq,
+ .unmask = pxa_unmask_irq,
};
/*
}
static struct irqchip pxa_low_gpio_chip = {
- ack: pxa_ack_low_gpio,
- mask: pxa_mask_irq,
- unmask: pxa_unmask_irq,
- rerun: pxa_manual_rerun,
- type: pxa_gpio_irq_type,
+ .ack = pxa_ack_low_gpio,
+ .mask = pxa_mask_irq,
+ .unmask = pxa_unmask_irq,
+ .rerun = pxa_manual_rerun,
+ .type = pxa_gpio_irq_type,
};
/*
}
static struct irqchip pxa_muxed_gpio_chip = {
- ack: pxa_ack_muxed_gpio,
- mask: pxa_mask_muxed_gpio,
- unmask: pxa_unmask_muxed_gpio,
- rerun: pxa_manual_rerun,
- type: pxa_gpio_irq_type,
+ .ack = pxa_ack_muxed_gpio,
+ .mask = pxa_mask_muxed_gpio,
+ .unmask = pxa_unmask_muxed_gpio,
+ .rerun = pxa_manual_rerun,
+ .type = pxa_gpio_irq_type,
};
}
static struct irqchip lubbock_irq_chip = {
- ack: lubbock_ack_irq,
- mask: lubbock_mask_irq,
- unmask: lubbock_unmask_irq,
+ .ack = lubbock_ack_irq,
+ .mask = lubbock_mask_irq,
+ .unmask = lubbock_unmask_irq,
};
void lubbock_irq_handler(unsigned int irq, struct irqdesc *desc,
}
static struct dma_ops iomd_dma_ops = {
- type: "IOMD",
- request: iomd_request_dma,
- free: iomd_free_dma,
- enable: iomd_enable_dma,
- disable: iomd_disable_dma,
- setspeed: iomd_set_dma_speed,
+ .type = "IOMD",
+ .request = iomd_request_dma,
+ .free = iomd_free_dma,
+ .enable = iomd_enable_dma,
+ .disable = iomd_disable_dma,
+ .setspeed = iomd_set_dma_speed,
};
static struct fiq_handler fh = {
- name: "floppydma"
+ .name = "floppydma"
};
static void floppy_enable_dma(dmach_t channel, dma_t *dma)
}
static struct dma_ops floppy_dma_ops = {
- type: "FIQDMA",
- enable: floppy_enable_dma,
- disable: floppy_disable_dma,
- residue: floppy_get_residue,
+ .type = "FIQDMA",
+ .enable = floppy_enable_dma,
+ .disable = floppy_disable_dma,
+ .residue = floppy_get_residue,
};
/*
}
static struct dma_ops sound_dma_ops = {
- type: "VIRTUAL",
- enable: sound_enable_disable_dma,
- disable: sound_enable_disable_dma,
+ .type = "VIRTUAL",
+ .enable = sound_enable_disable_dma,
+ .disable = sound_enable_disable_dma,
};
void __init arch_dma_init(dma_t *dma)
}
static struct irqchip iomd_a_chip = {
- ack: iomd_ack_irq_a,
- mask: iomd_mask_irq_a,
- unmask: iomd_unmask_irq_a,
+ .ack = iomd_ack_irq_a,
+ .mask = iomd_mask_irq_a,
+ .unmask = iomd_unmask_irq_a,
};
static void iomd_mask_irq_b(unsigned int irq)
}
static struct irqchip iomd_b_chip = {
- ack: iomd_mask_irq_b,
- mask: iomd_mask_irq_b,
- unmask: iomd_unmask_irq_b,
+ .ack = iomd_mask_irq_b,
+ .mask = iomd_mask_irq_b,
+ .unmask = iomd_unmask_irq_b,
};
static void iomd_mask_irq_dma(unsigned int irq)
}
static struct irqchip iomd_dma_chip = {
- ack: iomd_mask_irq_dma,
- mask: iomd_mask_irq_dma,
- unmask: iomd_unmask_irq_dma,
+ .ack = iomd_mask_irq_dma,
+ .mask = iomd_mask_irq_dma,
+ .unmask = iomd_unmask_irq_dma,
};
static void iomd_mask_irq_fiq(unsigned int irq)
}
static struct irqchip iomd_fiq_chip = {
- ack: iomd_mask_irq_fiq,
- mask: iomd_mask_irq_fiq,
- unmask: iomd_unmask_irq_fiq,
+ .ack = iomd_mask_irq_fiq,
+ .mask = iomd_mask_irq_fiq,
+ .unmask = iomd_unmask_irq_fiq,
};
void __init rpc_init_irq(void)
}
static struct sa1100_port_fns adsbitsy_port_fns __initdata = {
- open: adsbitsy_uart_open,
+ .open = adsbitsy_uart_open,
};
static void __init adsbitsy_map_io(void)
}
static struct sa1100_port_fns assabet_port_fns __initdata = {
- set_mctrl: assabet_set_mctrl,
- get_mctrl: assabet_get_mctrl,
- pm: assabet_uart_pm,
+ .set_mctrl = assabet_set_mctrl,
+ .get_mctrl = assabet_get_mctrl,
+ .pm = assabet_uart_pm,
};
static struct map_desc assabet_io_desc[] __initdata = {
static struct notifier_block sa1100_dram_block = {
- notifier_call: sa1100_dram_notifier,
+ .notifier_call = sa1100_dram_notifier,
};
};
static struct sdram_params tc59sm716_cl2_params __initdata = {
- rows: 12,
- tck: 10,
- trcd: 20,
- trp: 20,
- twr: 10,
- refresh: 64000,
- cas_latency: 2,
+ .rows = 12,
+ .tck = 10,
+ .trcd = 20,
+ .trp = 20,
+ .twr = 10,
+ .refresh = 64000,
+ .cas_latency = 2,
};
static struct sdram_params tc59sm716_cl3_params __initdata = {
- rows: 12,
- tck: 8,
- trcd: 20,
- trp: 20,
- twr: 8,
- refresh: 64000,
- cas_latency: 3,
+ .rows = 12,
+ .tck = 8,
+ .trcd = 20,
+ .trp = 20,
+ .twr = 8,
+ .refresh = 64000,
+ .cas_latency = 3,
};
static struct sdram_params samsung_k4s641632d_tc75 __initdata = {
- rows: 14,
- tck: 9,
- trcd: 27,
- trp: 20,
- twr: 9,
- refresh: 64000,
- cas_latency: 3,
+ .rows = 14,
+ .tck = 9,
+ .trcd = 27,
+ .trp = 20,
+ .twr = 9,
+ .refresh = 64000,
+ .cas_latency = 3,
};
static struct sdram_params samsung_km416s4030ct __initdata = {
- rows: 13,
- tck: 8,
- trcd: 24, /* 3 CLKs */
- trp: 24, /* 3 CLKs */
- twr: 16, /* Trdl: 2 CLKs */
- refresh: 64000,
- cas_latency: 3,
+ .rows = 13,
+ .tck = 8,
+ .trcd = 24, /* 3 CLKs */
+ .trp = 24, /* 3 CLKs */
+ .twr = 16, /* Trdl: 2 CLKs */
+ .refresh = 64000,
+ .cas_latency = 3,
};
static struct sdram_params wbond_w982516ah75l_cl3_params __initdata = {
- rows: 16,
- tck: 8,
- trcd: 20,
- trp: 20,
- twr: 8,
- refresh: 64000,
- cas_latency: 3,
+ .rows = 16,
+ .tck = 8,
+ .trcd = 20,
+ .trp = 20,
+ .twr = 8,
+ .refresh = 64000,
+ .cas_latency = 3,
};
static struct sdram_params sdram_params;
}
static struct irqchip gc_irq1_chip = {
- ack: gc_mask_irq1,
- mask: gc_mask_irq1,
- unmask: gc_unmask_irq1,
+ .ack = gc_mask_irq1,
+ .mask = gc_mask_irq1,
+ .unmask = gc_unmask_irq1,
};
static void gc_mask_irq2(unsigned int irq)
}
static struct irqchip gc_irq2_chip = {
- ack: gc_mask_irq2,
- mask: gc_mask_irq2,
- unmask: gc_unmask_irq2,
+ .ack = gc_mask_irq2,
+ .mask = gc_mask_irq2,
+ .unmask = gc_unmask_irq2,
};
static void __init graphicsclient_init_irq(void)
}
static struct sa1100_port_fns graphicsclient_port_fns __initdata = {
- get_mctrl: graphicsclient_get_mctrl,
- set_mctrl: graphicsclient_set_mctrl,
- pm: graphicsclient_uart_pm,
+ .get_mctrl = graphicsclient_get_mctrl,
+ .set_mctrl = graphicsclient_set_mctrl,
+ .pm = graphicsclient_uart_pm,
};
static void __init graphicsclient_map_io(void)
}
static struct irqchip gm_irq1_chip = {
- ack: gm_mask_irq1,
- mask: gm_mask_irq1,
- unmask: gm_unmask_irq1,
+ .ack = gm_mask_irq1,
+ .mask = gm_mask_irq1,
+ .unmask = gm_unmask_irq1,
};
static void gm_mask_irq2(unsigned int irq)
}
static struct irqchip gm_irq2_chip = {
- ack: gm_mask_irq2,
- mask: gm_mask_irq2,
- unmask: gm_unmask_irq2,
+ .ack = gm_mask_irq2,
+ .mask = gm_mask_irq2,
+ .unmask = gm_unmask_irq2,
};
static void __init graphicsmaster_init_irq(void)
}
static struct sa1100_port_fns graphicsmaster_port_fns __initdata = {
- get_mctrl: graphicsmaster_get_mctrl,
- set_mctrl: graphicsmaster_set_mctrl,
- pm: graphicsmaster_uart_pm,
+ .get_mctrl = graphicsmaster_get_mctrl,
+ .set_mctrl = graphicsmaster_set_mctrl,
+ .pm = graphicsmaster_uart_pm,
};
static void __init graphicsmaster_map_io(void)
}
static struct sa1100_port_fns h3600_port_fns __initdata = {
- set_mctrl: h3600_uart_set_mctrl,
- get_mctrl: h3600_uart_get_mctrl,
- pm: h3600_uart_pm,
- set_wake: h3600_uart_set_wake,
+ .set_mctrl = h3600_uart_set_mctrl,
+ .get_mctrl = h3600_uart_get_mctrl,
+ .pm = h3600_uart_pm,
+ .set_wake = h3600_uart_set_wake,
};
static struct map_desc h3600_io_desc[] __initdata = {
}
static struct irqchip sa1100_low_gpio_chip = {
- ack: sa1100_low_gpio_ack,
- mask: sa1100_low_gpio_mask,
- unmask: sa1100_low_gpio_unmask,
- rerun: sa1100_manual_rerun,
- type: sa1100_gpio_type,
+ .ack = sa1100_low_gpio_ack,
+ .mask = sa1100_low_gpio_mask,
+ .unmask = sa1100_low_gpio_unmask,
+ .rerun = sa1100_manual_rerun,
+ .type = sa1100_gpio_type,
};
/*
}
static struct irqchip sa1100_high_gpio_chip = {
- ack: sa1100_high_gpio_ack,
- mask: sa1100_high_gpio_mask,
- unmask: sa1100_high_gpio_unmask,
- rerun: sa1100_manual_rerun,
- type: sa1100_gpio_type,
+ .ack = sa1100_high_gpio_ack,
+ .mask = sa1100_high_gpio_mask,
+ .unmask = sa1100_high_gpio_unmask,
+ .rerun = sa1100_manual_rerun,
+ .type = sa1100_gpio_type,
};
/*
}
static struct irqchip sa1100_normal_chip = {
- ack: sa1100_mask_irq,
- mask: sa1100_mask_irq,
- unmask: sa1100_unmask_irq,
+ .ack = sa1100_mask_irq,
+ .mask = sa1100_mask_irq,
+ .unmask = sa1100_unmask_irq,
/* rerun should never be called */
};
static struct resource irq_resource = {
- name: "irqs",
- start: 0x90050000,
- end: 0x9005ffff,
+ .name = "irqs",
+ .start = 0x90050000,
+ .end = 0x9005ffff,
};
void __init sa1100_init_irq(void)
#include "sa1111.h"
static struct device neponset_device = {
- name: "Neponset",
- bus_id: "nep_bus",
+ .name = "Neponset",
+ .bus_id = "nep_bus",
};
/*
}
static struct sa1100_port_fns neponset_port_fns __initdata = {
- set_mctrl: neponset_set_mctrl,
- get_mctrl: neponset_get_mctrl,
+ .set_mctrl = neponset_set_mctrl,
+ .get_mctrl = neponset_get_mctrl,
};
static int __init neponset_init(void)
}
static struct irqchip sa1111_low_chip = {
- ack: sa1111_ack_lowirq,
- mask: sa1111_mask_lowirq,
- unmask: sa1111_unmask_lowirq,
- rerun: sa1111_rerun_lowirq,
- type: sa1111_type_lowirq,
+ .ack = sa1111_ack_lowirq,
+ .mask = sa1111_mask_lowirq,
+ .unmask = sa1111_unmask_lowirq,
+ .rerun = sa1111_rerun_lowirq,
+ .type = sa1111_type_lowirq,
};
static void sa1111_ack_highirq(unsigned int irq)
}
static struct irqchip sa1111_high_chip = {
- ack: sa1111_ack_highirq,
- mask: sa1111_mask_highirq,
- unmask: sa1111_unmask_highirq,
- rerun: sa1111_rerun_highirq,
- type: sa1111_type_highirq,
+ .ack = sa1111_ack_highirq,
+ .mask = sa1111_mask_highirq,
+ .unmask = sa1111_unmask_highirq,
+ .rerun = sa1111_rerun_highirq,
+ .type = sa1111_type_highirq,
};
static void __init sa1111_init_irq(int irq_nr)
}
static struct device_driver sa1111_device_driver = {
- suspend: sa1111_suspend,
- resume: sa1111_resume,
+ .suspend = sa1111_suspend,
+ .resume = sa1111_resume,
};
/**
}
static struct sa1100_port_fns simpad_port_fns __initdata = {
- pm: simpad_uart_pm,
+ .pm = simpad_uart_pm,
};
static void __init simpad_map_io(void)
};
static struct sa1100_port_fns system3_port_fns __initdata = {
- set_mctrl: system3_set_mctrl,
- get_mctrl: system3_get_mctrl,
- pm: system3_uart_pm,
+ .set_mctrl = system3_set_mctrl,
+ .get_mctrl = system3_get_mctrl,
+ .pm = system3_uart_pm,
};
static struct notifier_block system3_clkchg_block = {
- notifier_call: sdram_notifier,
+ .notifier_call = sdram_notifier,
};
/**********************************************************************
static struct irqaction cascade;
static struct irqchip fb_chip = {
- ack: shark_ack_8259A_irq,
- mask: shark_disable_8259A_irq,
- unmask: shark_enable_8259A_irq,
+ .ack = shark_ack_8259A_irq,
+ .mask = shark_disable_8259A_irq,
+ .unmask = shark_enable_8259A_irq,
};
void __init shark_init_irq(void)
extern void __init via82c505_preinit(void *sysdata);
static struct hw_pci shark_pci __initdata = {
- setup: via82c505_setup,
- swizzle: pci_std_swizzle,
- map_irq: shark_map_irq,
- nr_controllers: 1,
- scan: via82c505_scan_bus,
- preinit: via82c505_preinit
+ .setup = via82c505_setup,
+ .swizzle = pci_std_swizzle,
+ .map_irq = shark_map_irq,
+ .nr_controllers = 1,
+ .scan = via82c505_scan_bus,
+ .preinit = via82c505_preinit
};
static int __init shark_pci_init(void)
/************************* End of Prototypes **************************/
static struct timer_list motor_off_timer = {
- function: fd_motor_off_timer,
+ .function = fd_motor_off_timer,
};
#ifdef TRACKBUFFER
static struct timer_list readtrack_timer = {
- function: fd_readtrack_check,
+ .function = fd_readtrack_check,
};
#endif
static struct timer_list timeout_timer = {
- function: fd_times_out,
+ .function = fd_times_out,
};
static struct timer_list fd_timer = {
- function: check_change,
+ .function = check_change,
};
/* DAG: Haven't got a clue what this is? */
static struct block_device_operations floppy_fops =
{
- open: floppy_open,
- release: floppy_release,
- ioctl: fd_ioctl,
- check_media_change: check_floppy_change,
- revalidate: floppy_revalidate,
+ .open = floppy_open,
+ .release = floppy_release,
+ .ioctl = fd_ioctl,
+ .check_media_change = check_floppy_change,
+ .revalidate = floppy_revalidate,
};
static struct gendisk mfm_gendisk[2] = {
{
- major: MAJOR_NR,
- first_minor: 0,
- major_name: "mfm",
- minor_shift: 6,
- part: mfm,
+ .major = MAJOR_NR,
+ .first_minor = 0,
+ .major_name = "mfm",
+ .minor_shift = 6,
+ .part = mfm,
},
{
- major: MAJOR_NR,
- first_minor: 64,
- major_name: "mfm",
- minor_shift: 6,
- part: mfm + 64,
+ .major = MAJOR_NR,
+ .first_minor = 64,
+ .major_name = "mfm",
+ .minor_shift = 6,
+ .part = mfm + 64,
};
static struct block_device_operations mfm_fops =
{
- owner: THIS_MODULE,
- open: mfm_open,
- ioctl: mfm_ioctl,
+ .owner = THIS_MODULE,
+ .open = mfm_open,
+ .ioctl = mfm_ioctl,
};
static void mfm_geninit (void)
}
static struct file_operations rtc_fops = {
- ioctl: rtc_ioctl,
+ .ioctl = rtc_ioctl,
};
static struct miscdevice rtc_dev = {
- minor: RTC_MINOR,
- name: "rtc",
- fops: &rtc_fops,
+ .minor = RTC_MINOR,
+ .name = "rtc",
+ .fops = &rtc_fops,
};
/* IOC / IOMD i2c driver */
}
static struct i2c_algo_bit_data ioc_data = {
- setsda: ioc_setsda,
- setscl: ioc_setscl,
- getsda: ioc_getsda,
- getscl: ioc_getscl,
- udelay: 80,
- mdelay: 80,
- timeout: 100
+ .setsda = ioc_setsda,
+ .setscl = ioc_setscl,
+ .getsda = ioc_getsda,
+ .getscl = ioc_getscl,
+ .udelay = 80,
+ .mdelay = 80,
+ .timeout = 100
};
static int ioc_client_reg(struct i2c_client *client)
}
static struct i2c_adapter ioc_ops = {
- name: "IOC/IOMD",
- id: I2C_HW_B_IOC,
- algo_data: &ioc_data,
- client_register: ioc_client_reg,
- client_unregister: ioc_client_unreg
+ .name = "IOC/IOMD",
+ .id = I2C_HW_B_IOC,
+ .algo_data = &ioc_data,
+ .client_register = ioc_client_reg,
+ .client_unregister = ioc_client_unreg
};
static int __init i2c_ioc_init(void)
}
struct file_operations psaux_fops = {
- read: read_aux,
- write: write_aux,
- poll: aux_poll,
- open: open_aux,
- release: release_aux,
- fasync: fasync_aux,
+ .read = read_aux,
+ .write = write_aux,
+ .poll = aux_poll,
+ .open = open_aux,
+ .release = release_aux,
+ .fasync = fasync_aux,
};
/*
static unsigned short normal_addr[] = { 0x50, I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = {
- normal_i2c: normal_addr,
- normal_i2c_range: ignore,
- probe: ignore,
- probe_range: ignore,
- ignore: ignore,
- ignore_range: ignore,
- force: ignore,
+ .normal_i2c = normal_addr,
+ .normal_i2c_range = ignore,
+ .probe = ignore,
+ .probe_range = ignore,
+ .ignore = ignore,
+ .ignore_range = ignore,
+ .force = ignore,
};
#define DAT(x) ((unsigned int)(x->data))
}
static struct i2c_driver pcf8583_driver = {
- name: "PCF8583",
- id: I2C_DRIVERID_PCF8583,
- flags: I2C_DF_NOTIFY,
- attach_adapter: pcf8583_probe,
- detach_client: pcf8583_detach,
- command: pcf8583_command
+ .name = "PCF8583",
+ .id = I2C_DRIVERID_PCF8583,
+ .flags = I2C_DF_NOTIFY,
+ .attach_adapter = pcf8583_probe,
+ .detach_client = pcf8583_detach,
+ .command = pcf8583_command
};
static __init int pcf8583_init(void)
}
static expansioncard_ops_t etherh_ops = {
- irqenable: etherh_irq_enable,
- irqdisable: etherh_irq_disable,
+ .irqenable = etherh_irq_enable,
+ .irqdisable = etherh_irq_disable,
};
}
static Scsi_Host_Template acornscsi_template = {
- module: THIS_MODULE,
- proc_info: acornscsi_proc_info,
- name: "AcornSCSI",
- detect: acornscsi_detect,
- release: acornscsi_release,
- info: acornscsi_info,
- queuecommand: acornscsi_queuecmd,
- abort: acornscsi_abort,
- reset: acornscsi_reset,
- bios_param: scsicam_bios_param,
- can_queue: 16,
- this_id: 7,
- sg_tablesize: SG_ALL,
- cmd_per_lun: 2,
- unchecked_isa_dma: 0,
- use_clustering: DISABLE_CLUSTERING
+ .module = THIS_MODULE,
+ .proc_info = acornscsi_proc_info,
+ .name = "AcornSCSI",
+ .detect = acornscsi_detect,
+ .release = acornscsi_release,
+ .info = acornscsi_info,
+ .queuecommand = acornscsi_queuecmd,
+ .abort = acornscsi_abort,
+ .reset = acornscsi_reset,
+ .bios_param = scsicam_bios_param,
+ .can_queue = 16,
+ .this_id = 7,
+ .sg_tablesize = SG_ALL,
+ .cmd_per_lun = 2,
+ .unchecked_isa_dma = 0,
+ .use_clustering = DISABLE_CLUSTERING
};
static int __init acornscsi_init(void)
#include "../../scsi/NCR5380.c"
static Scsi_Host_Template cumanascsi_template = {
- module: THIS_MODULE,
- name: "Cumana 16-bit SCSI",
- detect: cumanascsi_detect,
- release: cumanascsi_release,
- info: cumanascsi_info,
- queuecommand: cumanascsi_queue_command,
- abort: cumanascsi_abort,
- reset: cumanascsi_reset,
- bios_param: scsicam_bios_param,
- can_queue: 16,
- this_id: 7,
- sg_tablesize: SG_ALL,
- cmd_per_lun: 2,
- unchecked_isa_dma: 0,
- use_clustering: DISABLE_CLUSTERING
+ .module = THIS_MODULE,
+ .name = "Cumana 16-bit SCSI",
+ .detect = cumanascsi_detect,
+ .release = cumanascsi_release,
+ .info = cumanascsi_info,
+ .queuecommand = cumanascsi_queue_command,
+ .abort = cumanascsi_abort,
+ .reset = cumanascsi_reset,
+ .bios_param = scsicam_bios_param,
+ .can_queue = 16,
+ .this_id = 7,
+ .sg_tablesize = SG_ALL,
+ .cmd_per_lun = 2,
+ .unchecked_isa_dma = 0,
+ .use_clustering = DISABLE_CLUSTERING
};
static int __init cumanascsi_init(void)
}
static Scsi_Host_Template cumanascsi2_template = {
- module: THIS_MODULE,
- proc_info: cumanascsi_2_proc_info,
- name: "Cumana SCSI II",
- detect: cumanascsi_2_detect,
- release: cumanascsi_2_release,
- info: cumanascsi_2_info,
- bios_param: scsicam_bios_param,
- can_queue: 1,
- this_id: 7,
- sg_tablesize: SG_ALL,
- cmd_per_lun: 1,
- use_clustering: DISABLE_CLUSTERING,
- command: fas216_command,
- queuecommand: fas216_queue_command,
- eh_host_reset_handler: fas216_eh_host_reset,
- eh_bus_reset_handler: fas216_eh_bus_reset,
- eh_device_reset_handler: fas216_eh_device_reset,
- eh_abort_handler: fas216_eh_abort,
+ .module = THIS_MODULE,
+ .proc_info = cumanascsi_2_proc_info,
+ .name = "Cumana SCSI II",
+ .detect = cumanascsi_2_detect,
+ .release = cumanascsi_2_release,
+ .info = cumanascsi_2_info,
+ .bios_param = scsicam_bios_param,
+ .can_queue = 1,
+ .this_id = 7,
+ .sg_tablesize = SG_ALL,
+ .cmd_per_lun = 1,
+ .use_clustering = DISABLE_CLUSTERING,
+ .command = fas216_command,
+ .queuecommand = fas216_queue_command,
+ .eh_host_reset_handler = fas216_eh_host_reset,
+ .eh_bus_reset_handler = fas216_eh_bus_reset,
+ .eh_device_reset_handler = fas216_eh_device_reset,
+ .eh_abort_handler = fas216_eh_abort,
};
static int __init cumanascsi2_init(void)
#include "../../scsi/NCR5380.c"
static Scsi_Host_Template ecoscsi_template = {
- module: THIS_MODULE,
- name: "Serial Port EcoSCSI NCR5380",
- detect: ecoscsi_detect,
- release: ecoscsi_release,
- info: ecoscsi_info,
- queuecommand: ecoscsi_queue_command,
- abort: ecoscsi_abort,
- reset: ecoscsi_reset,
- can_queue: 16,
- this_id: 7,
- sg_tablesize: SG_ALL,
- cmd_per_lun: 2,
- use_clustering: DISABLE_CLUSTERING
+ .module = THIS_MODULE,
+ .name = "Serial Port EcoSCSI NCR5380",
+ .detect = ecoscsi_detect,
+ .release = ecoscsi_release,
+ .info = ecoscsi_info,
+ .queuecommand = ecoscsi_queue_command,
+ .abort = ecoscsi_abort,
+ .reset = ecoscsi_reset,
+ .can_queue = 16,
+ .this_id = 7,
+ .sg_tablesize = SG_ALL,
+ .cmd_per_lun = 2,
+ .use_clustering = DISABLE_CLUSTERING
};
static int __init ecoscsi_init(void)
}
static Scsi_Host_Template eesox_template = {
- module: THIS_MODULE,
- proc_info: eesoxscsi_proc_info,
- name: "EESOX SCSI",
- detect: eesoxscsi_detect,
- release: eesoxscsi_release,
- info: eesoxscsi_info,
- bios_param: scsicam_bios_param,
- can_queue: 1,
- this_id: 7,
- sg_tablesize: SG_ALL,
- cmd_per_lun: 1,
- use_clustering: DISABLE_CLUSTERING,
- command: fas216_command,
- queuecommand: fas216_queue_command,
- eh_host_reset_handler: fas216_eh_host_reset,
- eh_bus_reset_handler: fas216_eh_bus_reset,
- eh_device_reset_handler: fas216_eh_device_reset,
- eh_abort_handler: fas216_eh_abort,
+ .module = THIS_MODULE,
+ .proc_info = eesoxscsi_proc_info,
+ .name = "EESOX SCSI",
+ .detect = eesoxscsi_detect,
+ .release = eesoxscsi_release,
+ .info = eesoxscsi_info,
+ .bios_param = scsicam_bios_param,
+ .can_queue = 1,
+ .this_id = 7,
+ .sg_tablesize = SG_ALL,
+ .cmd_per_lun = 1,
+ .use_clustering = DISABLE_CLUSTERING,
+ .command = fas216_command,
+ .queuecommand = fas216_queue_command,
+ .eh_host_reset_handler = fas216_eh_host_reset,
+ .eh_bus_reset_handler = fas216_eh_bus_reset,
+ .eh_device_reset_handler = fas216_eh_device_reset,
+ .eh_abort_handler = fas216_eh_abort,
};
static int __init eesox_init(void)
#include "../../scsi/NCR5380.c"
static Scsi_Host_Template oakscsi_template = {
- module: THIS_MODULE,
- proc_info: oakscsi_proc_info,
- name: "Oak 16-bit SCSI",
- detect: oakscsi_detect,
- release: oakscsi_release,
- info: oakscsi_info,
- queuecommand: oakscsi_queue_command,
- abort: oakscsi_abort,
- reset: oakscsi_reset,
- can_queue: 16,
- this_id: 7,
- sg_tablesize: SG_ALL,
- cmd_per_lun: 2,
- use_clustering: DISABLE_CLUSTERING
+ .module = THIS_MODULE,
+ .proc_info = oakscsi_proc_info,
+ .name = "Oak 16-bit SCSI",
+ .detect = oakscsi_detect,
+ .release = oakscsi_release,
+ .info = oakscsi_info,
+ .queuecommand = oakscsi_queue_command,
+ .abort = oakscsi_abort,
+ .reset = oakscsi_reset,
+ .can_queue = 16,
+ .this_id = 7,
+ .sg_tablesize = SG_ALL,
+ .cmd_per_lun = 2,
+ .use_clustering = DISABLE_CLUSTERING
};
static int __init oakscsi_init(void)
}
static Scsi_Host_Template powertecscsi_template = {
- module: THIS_MODULE,
- proc_info: powertecscsi_proc_info,
- name: "PowerTec SCSI",
- detect: powertecscsi_detect,
- release: powertecscsi_release,
- info: powertecscsi_info,
- bios_param: scsicam_bios_param,
- can_queue: 1,
- this_id: 7,
- sg_tablesize: SG_ALL,
- cmd_per_lun: 1,
- use_clustering: ENABLE_CLUSTERING,
- command: fas216_command,
- queuecommand: fas216_queue_command,
- eh_host_reset_handler: fas216_eh_host_reset,
- eh_bus_reset_handler: fas216_eh_bus_reset,
- eh_device_reset_handler: fas216_eh_device_reset,
- eh_abort_handler: fas216_eh_abort,
+ .module = THIS_MODULE,
+ .proc_info = powertecscsi_proc_info,
+ .name = "PowerTec SCSI",
+ .detect = powertecscsi_detect,
+ .release = powertecscsi_release,
+ .info = powertecscsi_info,
+ .bios_param = scsicam_bios_param,
+ .can_queue = 1,
+ .this_id = 7,
+ .sg_tablesize = SG_ALL,
+ .cmd_per_lun = 1,
+ .use_clustering = ENABLE_CLUSTERING,
+ .command = fas216_command,
+ .queuecommand = fas216_queue_command,
+ .eh_host_reset_handler = fas216_eh_host_reset,
+ .eh_bus_reset_handler = fas216_eh_bus_reset,
+ .eh_device_reset_handler = fas216_eh_device_reset,
+ .eh_abort_handler = fas216_eh_abort,
};
static int __init powertecscsi_init(void)
#define RATES sizeof(rates) / sizeof(rates[0])
static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
- count: RATES,
- list: rates,
- mask: 0,
+ .count = RATES,
+ .list = rates,
+ .mask = 0,
};
/* }}} */
static snd_pcm_hardware_t snd_sa11xx_uda1341_capture =
{
- info: (SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_BLOCK_TRANSFER |
- SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
- formats: SNDRV_PCM_FMTBIT_S16_LE,
- rates: (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
- SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |\
- SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
- SNDRV_PCM_RATE_KNOT),
- rate_min: 8000,
- rate_max: 48000,
- channels_min: 2,
- channels_max: 2,
- buffer_bytes_max: 16380,
- period_bytes_min: 64,
- period_bytes_max: 8190, /* <= MAX_DMA_SIZE from ams/arch-sa1100/dma.h */
- periods_min: 2,
- periods_max: 255,
- fifo_size: 0,
+ .info = (SNDRV_PCM_INFO_INTERLEAVED |
+ SNDRV_PCM_INFO_BLOCK_TRANSFER |
+ SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |\
+ SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
+ SNDRV_PCM_RATE_KNOT),
+ .rate_min = 8000,
+ .rate_max = 48000,
+ .channels_min: = 2,
+ .channels_max: = 2,
+ .buffer_bytes_max: = 16380,
+ .period_bytes_min: = 64,
+ .period_bytes_max: = 8190, /* <= MAX_DMA_SIZE from ams/arch-sa1100/dma.h */
+ .periods_min = 2,
+ .periods_max = 255,
+ .fifo_size = 0,
};
static snd_pcm_hardware_t snd_sa11xx_uda1341_playback =
{
- info: (SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_BLOCK_TRANSFER |
- SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
- formats: SNDRV_PCM_FMTBIT_S16_LE,
- rates: (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
- SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |\
- SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
- SNDRV_PCM_RATE_KNOT),
- rate_min: 8000,
- rate_max: 48000,
- channels_min: 2,
- channels_max: 2,
- buffer_bytes_max: 16380,
- period_bytes_min: 64,
- period_bytes_max: 8190, /* <= MAX_DMA_SIZE from ams/arch-sa1100/dma.h */
- periods_min: 2,
- periods_max: 255,
- fifo_size: 0,
+ .info = (SNDRV_PCM_INFO_INTERLEAVED |
+ SNDRV_PCM_INFO_BLOCK_TRANSFER |
+ SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |\
+ SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
+ SNDRV_PCM_RATE_KNOT),
+ .rate_min = 8000,
+ .rate_max = 48000,
+ .channels_min = 2,
+ .channels_max = 2,
+ .buffer_bytes_max = 16380,
+ .period_bytes_min = 64,
+ .period_bytes_max = 8190, /* <= MAX_DMA_SIZE from ams/arch-sa1100/dma.h */
+ .periods_min = 2,
+ .periods_max = 255,
+ .fifo_size = 0,
};
/* {{{ snd_card_sa11xx_uda1341_playback functions */
/* }}} */
static snd_pcm_ops_t snd_card_sa11xx_uda1341_playback_ops = {
- open: snd_card_sa11xx_uda1341_playback_open,
- close: snd_card_sa11xx_uda1341_playback_close,
- ioctl: snd_card_sa11xx_uda1341_playback_ioctl,
- hw_params: snd_sa11xx_uda1341_hw_params,
- hw_free: snd_sa11xx_uda1341_hw_free,
- prepare: snd_card_sa11xx_uda1341_playback_prepare,
- trigger: snd_card_sa11xx_uda1341_playback_trigger,
- pointer: snd_card_sa11xx_uda1341_playback_pointer,
+ .open = snd_card_sa11xx_uda1341_playback_open,
+ .close = snd_card_sa11xx_uda1341_playback_close,
+ .ioctl = snd_card_sa11xx_uda1341_playback_ioctl,
+ .hw_params = snd_sa11xx_uda1341_hw_params,
+ .hw_free = snd_sa11xx_uda1341_hw_free,
+ .prepare = snd_card_sa11xx_uda1341_playback_prepare,
+ .trigger = snd_card_sa11xx_uda1341_playback_trigger,
+ .pointer = snd_card_sa11xx_uda1341_playback_pointer,
};
static snd_pcm_ops_t snd_card_sa11xx_uda1341_capture_ops = {
- open: snd_card_sa11xx_uda1341_capture_open,
- close: snd_card_sa11xx_uda1341_capture_close,
- ioctl: snd_card_sa11xx_uda1341_capture_ioctl,
- hw_params: snd_sa11xx_uda1341_hw_params,
- hw_free: snd_sa11xx_uda1341_hw_free,
- prepare: snd_card_sa11xx_uda1341_capture_prepare,
- trigger: snd_card_sa11xx_uda1341_capture_trigger,
- pointer: snd_card_sa11xx_uda1341_capture_pointer,
+ .open = snd_card_sa11xx_uda1341_capture_open,
+ .close = snd_card_sa11xx_uda1341_capture_close,
+ .ioctl = snd_card_sa11xx_uda1341_capture_ioctl,
+ .hw_params = snd_sa11xx_uda1341_hw_params,
+ .hw_free = snd_sa11xx_uda1341_hw_free,
+ .prepare = snd_card_sa11xx_uda1341_capture_prepare,
+ .trigger = snd_card_sa11xx_uda1341_capture_trigger,
+ .pointer = snd_card_sa11xx_uda1341_capture_pointer,
};
static int __init snd_card_sa11xx_uda1341_pcm(sa11xx_uda1341_t *sa11xx_uda1341, int device, int substreams)
projects / history.git / commitdiff