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, ...@@ -99,11 +99,11 @@ static int nvram_ioctl(struct inode *inode, struct file *file,
} }
struct file_operations nvram_fops = { struct file_operations nvram_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: nvram_llseek, .llseek = nvram_llseek,
read: read_nvram, .read = read_nvram,
write: write_nvram, .write = write_nvram,
ioctl: nvram_ioctl, .ioctl = nvram_ioctl,
}; };
static struct miscdevice nvram_dev = { static struct miscdevice nvram_dev = {
......
...@@ -33,33 +33,33 @@ struct naca_struct *naca; ...@@ -33,33 +33,33 @@ struct naca_struct *naca;
*/ */
#define PACAINITDATA(number,start,lpq,asrr,asrv) \ #define PACAINITDATA(number,start,lpq,asrr,asrv) \
{ \ { \
xLpPacaPtr: &paca[number].xLpPaca, \ .xLpPacaPtr = &paca[number].xLpPaca, \
xLpRegSavePtr: &paca[number].xRegSav, \ .xLpRegSavePtr = &paca[number].xRegSav, \
xPacaIndex: (number), /* Paca Index */ \ .xPacaIndex = (number), /* Paca Index */ \
default_decr: 0x00ff0000, /* Initial Decr */ \ .default_decr = 0x00ff0000, /* Initial Decr */ \
xStab_data: { \ .xStab_data = { \
real: (asrr), /* Real pointer to segment table */ \ .real = (asrr), /* Real pointer to segment table */ \
virt: (asrv), /* Virt pointer to segment table */ \ .virt = (asrv), /* Virt pointer to segment table */ \
next_round_robin: 1 /* Round robin index */ \ .next_round_robin = 1 /* Round robin index */ \
}, \ }, \
lpQueuePtr: (lpq), /* &xItLpQueue, */ \ .lpQueuePtr = (lpq), /* &xItLpQueue, */ \
/* xRtas: { \ /* .xRtas = { \
lock: SPIN_LOCK_UNLOCKED \ .lock = SPIN_LOCK_UNLOCKED \
}, */ \ }, */ \
xProcStart: (start), /* Processor start */ \ .xProcStart = (start), /* Processor start */ \
xLpPaca: { \ .xLpPaca = { \
xDesc: 0xd397d781, /* "LpPa" */ \ .xDesc = 0xd397d781, /* "LpPa" */ \
xSize: sizeof(struct ItLpPaca), \ .xSize = sizeof(struct ItLpPaca), \
xFPRegsInUse: 1, \ .xFPRegsInUse = 1, \
xDynProcStatus: 2, \ .xDynProcStatus = 2, \
xDecrVal: 0x00ff0000, \ .xDecrVal = 0x00ff0000, \
xEndOfQuantum: 0xffffffffffffffff \ .xEndOfQuantum = 0xffffffffffffffff \
}, \ }, \
xRegSav: { \ .xRegSav = { \
xDesc: 0xd397d9e2, /* "LpRS" */ \ .xDesc = 0xd397d9e2, /* "LpRS" */ \
xSize: sizeof(struct ItLpRegSave) \ .xSize = sizeof(struct ItLpRegSave) \
}, \ }, \
exception_sp: \ .exception_sp = \
(&paca[number].exception_stack[0]) - EXC_FRAME_SIZE, \ (&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, ...@@ -162,26 +162,26 @@ static ssize_t ppc_rtas_tone_volume_read(struct file * file, char * buf,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
struct file_operations ppc_rtas_poweron_operations = { struct file_operations ppc_rtas_poweron_operations = {
read: ppc_rtas_poweron_read, .read = ppc_rtas_poweron_read,
write: ppc_rtas_poweron_write .write = ppc_rtas_poweron_write
}; };
struct file_operations ppc_rtas_progress_operations = { struct file_operations ppc_rtas_progress_operations = {
read: ppc_rtas_progress_read, .read = ppc_rtas_progress_read,
write: ppc_rtas_progress_write .write = ppc_rtas_progress_write
}; };
struct file_operations ppc_rtas_clock_operations = { struct file_operations ppc_rtas_clock_operations = {
read: ppc_rtas_clock_read, .read = ppc_rtas_clock_read,
write: ppc_rtas_clock_write .write = ppc_rtas_clock_write
}; };
struct file_operations ppc_rtas_tone_freq_operations = { struct file_operations ppc_rtas_tone_freq_operations = {
read: ppc_rtas_tone_freq_read, .read = ppc_rtas_tone_freq_read,
write: ppc_rtas_tone_freq_write .write = ppc_rtas_tone_freq_write
}; };
struct file_operations ppc_rtas_tone_volume_operations = { struct file_operations ppc_rtas_tone_volume_operations = {
read: ppc_rtas_tone_volume_read, .read = ppc_rtas_tone_volume_read,
write: ppc_rtas_tone_volume_write .write = ppc_rtas_tone_volume_write
}; };
int ppc_rtas_find_all_sensors (void); int ppc_rtas_find_all_sensors (void);
......
...@@ -51,7 +51,7 @@ struct flash_block_list_header rtas_firmware_flash_list = {0, 0}; ...@@ -51,7 +51,7 @@ struct flash_block_list_header rtas_firmware_flash_list = {0, 0};
*/ */
struct rtas_t rtas = { struct rtas_t rtas = {
lock: SPIN_LOCK_UNLOCKED .lock = SPIN_LOCK_UNLOCKED
}; };
extern unsigned long reloc_offset(void); extern unsigned long reloc_offset(void);
......
...@@ -114,10 +114,10 @@ static unsigned int rtas_log_poll(struct file *file, poll_table * wait) ...@@ -114,10 +114,10 @@ static unsigned int rtas_log_poll(struct file *file, poll_table * wait)
} }
struct file_operations proc_rtas_log_operations = { struct file_operations proc_rtas_log_operations = {
read: rtas_log_read, .read = rtas_log_read,
poll: rtas_log_poll, .poll = rtas_log_poll,
open: rtas_log_open, .open = rtas_log_open,
release: rtas_log_release, .release = rtas_log_release,
}; };
static void log_rtas(char *buf) static void log_rtas(char *buf)
......
...@@ -178,12 +178,12 @@ static int rtc_release(struct inode *inode, struct file *file) ...@@ -178,12 +178,12 @@ static int rtc_release(struct inode *inode, struct file *file)
* The various file operations we support. * The various file operations we support.
*/ */
static struct file_operations rtc_fops = { static struct file_operations rtc_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: rtc_llseek, .llseek = rtc_llseek,
read: rtc_read, .read = rtc_read,
ioctl: rtc_ioctl, .ioctl = rtc_ioctl,
open: rtc_open, .open = rtc_open,
release: rtc_release, .release = rtc_release,
}; };
static struct miscdevice rtc_dev= static struct miscdevice rtc_dev=
......
...@@ -353,10 +353,10 @@ static void c_stop(struct seq_file *m, void *v) ...@@ -353,10 +353,10 @@ static void c_stop(struct seq_file *m, void *v)
{ {
} }
struct seq_operations cpuinfo_op = { struct seq_operations cpuinfo_op = {
start: c_start, .start =c_start,
next: c_next, .next = c_next,
stop: c_stop, .stop = c_stop,
show: show_cpuinfo, .show = show_cpuinfo,
}; };
/* /*
......
...@@ -58,9 +58,9 @@ static void sysrq_handle_xmon(int key, struct pt_regs *pt_regs, struct tty_struc ...@@ -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 = static struct sysrq_key_op sysrq_xmon_op =
{ {
handler: sysrq_handle_xmon, .handler = sysrq_handle_xmon,
help_msg: "xmon", .help_msg = "xmon",
action_msg: "Entering xmon\n", .action_msg = "Entering xmon\n",
}; };
void 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