Commit e4481393 authored by Anton Blanchard's avatar Anton Blanchard

ppc64: Designated initializers from Rusty

parent b8e13e89
......@@ -99,11 +99,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file,
}
struct file_operations nvram_fops = {
owner: THIS_MODULE,
llseek: nvram_llseek,
read: read_nvram,
write: write_nvram,
ioctl: nvram_ioctl,
.owner = THIS_MODULE,
.llseek = nvram_llseek,
.read = read_nvram,
.write = write_nvram,
.ioctl = nvram_ioctl,
};
static struct miscdevice nvram_dev = {
......
......@@ -33,33 +33,33 @@ struct naca_struct *naca;
*/
#define PACAINITDATA(number,start,lpq,asrr,asrv) \
{ \
xLpPacaPtr: &paca[number].xLpPaca, \
xLpRegSavePtr: &paca[number].xRegSav, \
xPacaIndex: (number), /* Paca Index */ \
default_decr: 0x00ff0000, /* Initial Decr */ \
xStab_data: { \
real: (asrr), /* Real pointer to segment table */ \
virt: (asrv), /* Virt pointer to segment table */ \
next_round_robin: 1 /* Round robin index */ \
.xLpPacaPtr = &paca[number].xLpPaca, \
.xLpRegSavePtr = &paca[number].xRegSav, \
.xPacaIndex = (number), /* Paca Index */ \
.default_decr = 0x00ff0000, /* Initial Decr */ \
.xStab_data = { \
.real = (asrr), /* Real pointer to segment table */ \
.virt = (asrv), /* Virt pointer to segment table */ \
.next_round_robin = 1 /* Round robin index */ \
}, \
lpQueuePtr: (lpq), /* &xItLpQueue, */ \
/* xRtas: { \
lock: SPIN_LOCK_UNLOCKED \
.lpQueuePtr = (lpq), /* &xItLpQueue, */ \
/* .xRtas = { \
.lock = SPIN_LOCK_UNLOCKED \
}, */ \
xProcStart: (start), /* Processor start */ \
xLpPaca: { \
xDesc: 0xd397d781, /* "LpPa" */ \
xSize: sizeof(struct ItLpPaca), \
xFPRegsInUse: 1, \
xDynProcStatus: 2, \
xDecrVal: 0x00ff0000, \
xEndOfQuantum: 0xffffffffffffffff \
.xProcStart = (start), /* Processor start */ \
.xLpPaca = { \
.xDesc = 0xd397d781, /* "LpPa" */ \
.xSize = sizeof(struct ItLpPaca), \
.xFPRegsInUse = 1, \
.xDynProcStatus = 2, \
.xDecrVal = 0x00ff0000, \
.xEndOfQuantum = 0xffffffffffffffff \
}, \
xRegSav: { \
xDesc: 0xd397d9e2, /* "LpRS" */ \
xSize: sizeof(struct ItLpRegSave) \
.xRegSav = { \
.xDesc = 0xd397d9e2, /* "LpRS" */ \
.xSize = sizeof(struct ItLpRegSave) \
}, \
exception_sp: \
.exception_sp = \
(&paca[number].exception_stack[0]) - EXC_FRAME_SIZE, \
}
......
......@@ -162,26 +162,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);
......
......@@ -51,7 +51,7 @@ struct flash_block_list_header rtas_firmware_flash_list = {0, 0};
*/
struct rtas_t rtas = {
lock: SPIN_LOCK_UNLOCKED
.lock = SPIN_LOCK_UNLOCKED
};
extern unsigned long reloc_offset(void);
......
......@@ -114,10 +114,10 @@ static unsigned int rtas_log_poll(struct file *file, poll_table * wait)
}
struct file_operations proc_rtas_log_operations = {
read: rtas_log_read,
poll: rtas_log_poll,
open: rtas_log_open,
release: rtas_log_release,
.read = rtas_log_read,
.poll = rtas_log_poll,
.open = rtas_log_open,
.release = rtas_log_release,
};
static void log_rtas(char *buf)
......
......@@ -178,12 +178,12 @@ static int rtc_release(struct inode *inode, struct file *file)
* The various file operations we support.
*/
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=
......
......@@ -353,10 +353,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,
};
/*
......
......@@ -58,9 +58,9 @@ static void sysrq_handle_xmon(int key, struct pt_regs *pt_regs, struct tty_struc
}
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",
};
void
......
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