Commit d40454d1 authored by Paul Mackerras's avatar Paul Mackerras Committed by Paul Mackerras

PPC32: update some initializers to the standard format, from Rusty.

parent 535b1d68
......@@ -343,13 +343,13 @@ static void sicc_set_mctrl_null(struct SICC_port *port, u_int mctrl)
static struct SICC_port sicc_ports[SERIAL_SICC_NR] = {
{
uart_base: 0,
uart_base_phys: SICC0_IO_BASE,
irqrx: SICC0_INTRX,
irqtx: SICC0_INTTX,
// uartclk: 0,
fifosize: 1,
set_mctrl: sicc_set_mctrl_null,
.uart_base = 0,
.uart_base_phys = SICC0_IO_BASE,
.irqrx = SICC0_INTRX,
.irqtx = SICC0_INTTX,
// .uartclk = 0,
.fifosize = 1,
.set_mctrl = sicc_set_mctrl_null,
}
};
......@@ -2113,16 +2113,16 @@ static int __init siccuart_console_setup(struct console *co, char *options)
static struct console siccuart_cons =
{
name: SERIAL_SICC_NAME,
write: siccuart_console_write,
.name = SERIAL_SICC_NAME,
.write = siccuart_console_write,
#ifdef used_and_not_const_char_pointer
read: siccuart_console_read,
.read = siccuart_console_read,
#endif
device: siccuart_console_device,
wait_key: siccuart_console_wait_key,
setup: siccuart_console_setup,
flags: CON_PRINTBUFFER,
index: -1,
.device = siccuart_console_device,
.wait_key = siccuart_console_wait_key,
.setup = siccuart_console_setup,
.flags = CON_PRINTBUFFER,
.index = -1,
};
void __init sicc_console_init(void)
......
......@@ -2463,12 +2463,12 @@ static kdev_t serial_console_device(struct console *c)
static struct console sercons = {
name: "ttyS",
write: serial_console_write,
device: serial_console_device,
setup: serial_console_setup,
flags: CON_PRINTBUFFER,
index: CONFIG_SERIAL_CONSOLE_PORT,
.name = "ttyS",
.write = serial_console_write,
.device = serial_console_device,
.setup = serial_console_setup,
.flags = CON_PRINTBUFFER,
.index = CONFIG_SERIAL_CONSOLE_PORT,
};
/*
......
......@@ -1376,7 +1376,7 @@ static void cs_nosound(unsigned long xx)
}
static struct timer_list beep_timer = {
function: cs_nosound
.function = cs_nosound
};
static void cs_mksound(unsigned int hz, unsigned int ticks)
......@@ -1468,21 +1468,21 @@ static void CS_release(void)
}
static MACHINE mach_cs4218 = {
name: "HIOX CS4218",
name2: "Built-in Sound",
open: CS_open,
release: CS_release,
dma_alloc: CS_Alloc,
dma_free: CS_Free,
irqinit: CS_IrqInit,
.name = "HIOX CS4218",
.name2 = "Built-in Sound",
.open = CS_open,
.release = CS_release,
.dma_alloc = CS_Alloc,
.dma_free = CS_Free,
.irqinit = CS_IrqInit,
#ifdef MODULE
irqcleanup: CS_IrqCleanup,
.irqcleanup = CS_IrqCleanup,
#endif /* MODULE */
init: CS_Init,
silence: CS_Silence,
setFormat: CS_SetFormat,
setVolume: CS_SetVolume,
play: CS_Play
.init = CS_Init,
.silence = CS_Silence,
.setFormat = CS_SetFormat,
.setVolume = CS_SetVolume,
.play = CS_Play
};
......@@ -1724,11 +1724,11 @@ static int mixer_ioctl(struct inode *inode, struct file *file, u_int cmd,
static struct file_operations mixer_fops =
{
owner: THIS_MODULE,
llseek: sound_lseek,
ioctl: mixer_ioctl,
open: mixer_open,
release: mixer_release,
.owner = THIS_MODULE,
.llseek = sound_lseek,
.ioctl = mixer_ioctl,
.open = mixer_open,
.release = mixer_release,
};
......@@ -2314,13 +2314,13 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
static struct file_operations sq_fops =
{
owner: THIS_MODULE,
llseek: sound_lseek,
read: sq_read, /* sq_read */
write: sq_write,
ioctl: sq_ioctl,
open: sq_open,
release: sq_release,
.owner = THIS_MODULE,
.llseek = sound_lseek,
.read = sq_read, /* sq_read */
.write = sq_write,
.ioctl = sq_ioctl,
.open = sq_open,
.release = sq_release,
};
......@@ -2451,11 +2451,11 @@ static ssize_t state_read(struct file *file, char *buf, size_t count,
static struct file_operations state_fops =
{
owner: THIS_MODULE,
llseek: sound_lseek,
read: state_read,
open: state_open,
release: state_release,
.owner = THIS_MODULE,
.llseek = sound_lseek,
.read = state_read,
.open = state_open,
.release = state_release,
};
......
......@@ -224,12 +224,12 @@ typedef struct serial_info {
} ser_info_t;
static struct console sercons = {
name: "ttyS",
write: serial_console_write,
device: serial_console_device,
setup: serial_console_setup,
flags: CON_PRINTBUFFER,
index: CONFIG_SERIAL_CONSOLE_PORT,
.name = "ttyS",
.write = serial_console_write,
.device = serial_console_device,
.setup = serial_console_setup,
.flags = CON_PRINTBUFFER,
.index = CONFIG_SERIAL_CONSOLE_PORT,
};
static void change_speed(ser_info_t *info);
......
......@@ -109,9 +109,9 @@ static void amiga_heartbeat(int on);
#endif
static struct console amiga_console_driver = {
name: "debug",
flags: CON_PRINTBUFFER,
index: -1,
.name = "debug",
.flags = CON_PRINTBUFFER,
.index = -1,
};
......@@ -123,10 +123,10 @@ static struct {
struct resource _ciab, _ciaa, _custom, _kickstart;
} mb_resources = {
// { "Ranger Memory", 0x00c00000, 0x00c7ffff },
_ciab: { "CIA B", 0x00bfd000, 0x00bfdfff },
_ciaa: { "CIA A", 0x00bfe000, 0x00bfefff },
_custom: { "Custom I/O", 0x00dff000, 0x00dfffff },
_kickstart: { "Kickstart ROM", 0x00f80000, 0x00ffffff }
._ciab = { "CIA B", 0x00bfd000, 0x00bfdfff },
._ciaa = { "CIA A", 0x00bfe000, 0x00bfefff },
._custom = { "Custom I/O", 0x00dff000, 0x00dfffff },
._kickstart = { "Kickstart ROM", 0x00f80000, 0x00ffffff }
};
static struct resource rtc_resource = {
......
......@@ -59,21 +59,21 @@ unsigned maxPacas = maxProcessors * 2;
// 8192 indicates to map 8192 pages (32 MB) of the load area.
struct LparMap xLparMap = {
xNumberEsids: 4, // Number ESID/VSID pairs
xNumberRanges: 1, // Number of memory ranges
xSegmentTableOffs: 0, // Segment Table Page (unused)
xKernelEsidC: 0xC, // ESID to map
xKernelVsidC: 0xCCC, // VSID to map
xKernelEsidD: 0xD, // ESID to map
xKernelVsidD: 0xDDD, // VSID to map
xKernelEsidE: 0xE, // ESID to map
xKernelVsidE: 0xEEE, // VSID to map
xKernelEsidF: 0xF, // ESID to map
xKernelVsidF: 0xFFF, // VSID to map
xPages: HvPagesToMap, // # of pages to map (8192)
xOffset: 0, // Offset into load area
xVPN: 0xCCC0000 // VPN of first mapped page
.xNumberEsids =4, // Number ESID/VSID pairs
.xNumberRanges =1, // Number of memory ranges
.xSegmentTableOffs =0, // Segment Table Page (unused)
.xKernelEsidC =0xC, // ESID to map
.xKernelVsidC =0xCCC, // VSID to map
.xKernelEsidD =0xD, // ESID to map
.xKernelVsidD =0xDDD, // VSID to map
.xKernelEsidE =0xE, // ESID to map
.xKernelVsidE =0xEEE, // VSID to map
.xKernelEsidF =0xF, // ESID to map
.xKernelVsidF =0xFFF, // VSID to map
.xPages = HvPagesToMap, // # of pages to map (8192)
.xOffset = 0, // Offset into load area
.xVPN = 0xCCC0000 // VPN of first mapped page
};
// The Naca has a pointer to the ItVpdAreas. The hypervisor finds
......@@ -119,11 +119,11 @@ struct ItLpQueue xItLpQueue = {};
(lpq), \
0, 0, {0}, \
{ /* LpPaca */ \
xDesc: 0xd397d781, /* "LpPa" */ \
xSize: sizeof(struct ItLpPaca), \
xFPRegsInUse: 1, \
xDynProcStatus: 2, \
xEndOfQuantum: 0xffffffffffffffff \
.xDesc = 0xd397d781, /* "LpPa" */ \
.xSize = sizeof(struct ItLpPaca), \
.xFPRegsInUse =1, \
.xDynProcStatus = 2, \
.xEndOfQuantum =0xffffffffffffffff \
}, \
{ /* LpRegSave */ \
0xd397d9e2, /* "LpRS" */ \
......@@ -245,7 +245,7 @@ struct ItIplParmsReal xItIplParmsReal = {};
struct IoHriProcessorVpd xIoHriProcessorVpd[maxProcessors] = {
{
xTimeBaseFreq: 50000000
.xTimeBaseFreq = 50000000
}
};
......
......@@ -175,12 +175,12 @@ static int rtc_release(struct inode *inode, struct file *file)
*/
static struct file_operations rtc_fops = {
owner: THIS_MODULE,
llseek: rtc_llseek,
read: rtc_read,
ioctl: rtc_ioctl,
open: rtc_open,
release: rtc_release,
.owner = THIS_MODULE,
.llseek = rtc_llseek,
.read = rtc_read,
.ioctl = rtc_ioctl,
.open = rtc_open,
.release = rtc_release,
};
static struct miscdevice rtc_dev=
......
......@@ -166,11 +166,11 @@ ppc405_sercons_read(struct console *co, char *ptr, unsigned nb)
}
static struct console ppc405_sercons = {
name: "dbg_cons",
write: ppc405_console_write,
setup: ppc405_console_setup,
flags: CON_PRINTBUFFER,
index: -1,
.name = "dbg_cons",
.write = ppc405_console_write,
.setup = ppc405_console_setup,
.flags = CON_PRINTBUFFER,
.index = -1,
};
void
......
......@@ -66,9 +66,9 @@ extern unsigned int htab_hash_searches;
#define PMC2 954
struct file_operations ppc_htab_operations = {
llseek: ppc_htab_lseek,
read: ppc_htab_read,
write: ppc_htab_write,
.llseek = ppc_htab_lseek,
.read = ppc_htab_read,
.write = ppc_htab_write,
};
static char *pmc1_lookup(unsigned long mmcr0)
......
......@@ -250,10 +250,10 @@ static void c_stop(struct seq_file *m, void *v)
}
struct seq_operations cpuinfo_op = {
start: c_start,
next: c_next,
stop: c_stop,
show: show_cpuinfo,
.start =c_start,
.next = c_next,
.stop = c_stop,
.show = show_cpuinfo,
};
/*
......
......@@ -667,14 +667,14 @@ extern void amiga_enable_irq(unsigned int irq);
extern void amiga_disable_irq(unsigned int irq);
struct hw_interrupt_type amiga_sys_irqctrl = {
typename: "Amiga IPL",
end: apus_end_irq,
.typename = "Amiga IPL",
.end = apus_end_irq,
};
struct hw_interrupt_type amiga_irqctrl = {
typename: "Amiga ",
enable: amiga_enable_irq,
disable: amiga_disable_irq,
.typename = "Amiga ",
.enable = amiga_enable_irq,
.disable = amiga_disable_irq,
};
#define HARDWARE_MAPPED_SIZE (512*1024)
......
......@@ -164,26 +164,26 @@ static ssize_t ppc_rtas_tone_volume_read(struct file * file, char * buf,
size_t count, loff_t *ppos);
struct file_operations ppc_rtas_poweron_operations = {
read: ppc_rtas_poweron_read,
write: ppc_rtas_poweron_write
.read = ppc_rtas_poweron_read,
.write = ppc_rtas_poweron_write
};
struct file_operations ppc_rtas_progress_operations = {
read: ppc_rtas_progress_read,
write: ppc_rtas_progress_write
.read = ppc_rtas_progress_read,
.write = ppc_rtas_progress_write
};
struct file_operations ppc_rtas_clock_operations = {
read: ppc_rtas_clock_read,
write: ppc_rtas_clock_write
.read = ppc_rtas_clock_read,
.write = ppc_rtas_clock_write
};
struct file_operations ppc_rtas_tone_freq_operations = {
read: ppc_rtas_tone_freq_read,
write: ppc_rtas_tone_freq_write
.read = ppc_rtas_tone_freq_read,
.write = ppc_rtas_tone_freq_write
};
struct file_operations ppc_rtas_tone_volume_operations = {
read: ppc_rtas_tone_volume_read,
write: ppc_rtas_tone_volume_write
.read = ppc_rtas_tone_volume_read,
.write = ppc_rtas_tone_volume_write
};
int ppc_rtas_find_all_sensors (void);
......
......@@ -105,9 +105,9 @@ static void sysrq_handle_xmon(int key, struct pt_regs *regs,
static struct sysrq_key_op sysrq_xmon_op =
{
handler: sysrq_handle_xmon,
help_msg: "Xmon",
action_msg: "Entering xmon\n",
.handler = sysrq_handle_xmon,
.help_msg = "Xmon",
.action_msg = "Entering xmon\n",
};
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment