Skip to content

L
linux
Commit f5f11ecb authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] more new struct initializers 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 527906dd
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 67 deletions
drivers/char/ipmi/ipmi_poweroff.c
View file @ f5f11ecb
...@@ -83,7 +83,7 @@ static void receive_handler(struct ipmi_recv_msg *recv_msg, void *handler_data) ...@@ -83,7 +83,7 @@ static void receive_handler(struct ipmi_recv_msg *recv_msg, void *handler_data)
static struct ipmi_user_hndl ipmi_poweroff_handler = static struct ipmi_user_hndl ipmi_poweroff_handler =
{ {
ipmi_recv_hndl : receive_handler .ipmi_recv_hndl = receive_handler
}; };
......
drivers/media/dvb/dvb-core/dvb_ca_en50221.c
View file @ f5f11ecb
...@@ -1484,21 +1484,20 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table *wait) ...@@ -1484,21 +1484,20 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)
static struct file_operations dvb_ca_fops = { static struct file_operations dvb_ca_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
read: dvb_ca_en50221_io_read, .read = dvb_ca_en50221_io_read,
write: dvb_ca_en50221_io_write, .write = dvb_ca_en50221_io_write,
ioctl: dvb_ca_en50221_io_ioctl, .ioctl = dvb_ca_en50221_io_ioctl,
open: dvb_ca_en50221_io_open, .open = dvb_ca_en50221_io_open,
release: dvb_ca_en50221_io_release, .release = dvb_ca_en50221_io_release,
poll: dvb_ca_en50221_io_poll, .poll = dvb_ca_en50221_io_poll,
}; };
static struct dvb_device dvbdev_ca = { static struct dvb_device dvbdev_ca = {
priv: NULL, .users = 1,
users: 1, .readers = 1,
readers: 1, .writers = 1,
writers: 1, .fops = &dvb_ca_fops,
fops: &dvb_ca_fops,
}; };
......
drivers/media/dvb/frontends/stv0299.c
View file @ f5f11ecb
...@@ -319,7 +319,7 @@ static int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len) ...@@ -319,7 +319,7 @@ static int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
static int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len) static int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
{ {
int ret; int ret;
struct i2c_msg msg = { addr: addr, .flags = 0, .buf = data, .len = len }; struct i2c_msg msg = { .addr = addr, .buf = data, .len = len };
stv0299_writereg(i2c, 0x05, 0xb5); /* enable i2c repeater on stv0299 */ stv0299_writereg(i2c, 0x05, 0xb5); /* enable i2c repeater on stv0299 */
...@@ -1257,12 +1257,12 @@ static long probe_tuner (struct dvb_i2c_bus *i2c) ...@@ -1257,12 +1257,12 @@ static long probe_tuner (struct dvb_i2c_bus *i2c)
u8 stat [] = { 0 }; u8 stat [] = { 0 };
u8 tda6100_buf [] = { 0, 0 }; u8 tda6100_buf [] = { 0, 0 };
int ret; int ret;
struct i2c_msg msg1 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt, len: 2 }, struct i2c_msg msg1 [] = {{ .addr = 0x68, .buf = rpt, .len = 2 },
{ .addr = 0x60, .flags = I2C_M_RD, .buf = stat, .len = 1 }}; { .addr = 0x60, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
struct i2c_msg msg2 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt, len: 2 }, struct i2c_msg msg2 [] = {{ .addr = 0x68, .buf = rpt, .len = 2 },
{ .addr = 0x61, .flags = I2C_M_RD, .buf = stat, .len = 1 }}; { .addr = 0x61, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
struct i2c_msg msg3 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt, len: 2 }, struct i2c_msg msg3 [] = {{ .addr = 0x68, .buf = rpt, .len = 2 },
{ .addr = 0x60, .flags = 0, .buf = tda6100_buf, .len = 2 }}; { .addr = 0x60, .buf = tda6100_buf, .len = 2 }};
stv0299_writereg (i2c, 0x01, 0x15); stv0299_writereg (i2c, 0x01, 0x15);
stv0299_writereg (i2c, 0x02, 0x30); stv0299_writereg (i2c, 0x02, 0x30);
......
drivers/mtd/chips/jedec_probe.c
View file @ f5f11ecb
...@@ -512,12 +512,12 @@ static const struct amd_flash_info jedec_table[] = { ...@@ -512,12 +512,12 @@ static const struct amd_flash_info jedec_table[] = {
ERASEINFO(0x10000,8), ERASEINFO(0x10000,8),
} }
}, { }, {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29F002T, .dev_id = AM29F002T,
name: "AMD AM29F002T", .name = "AMD AM29F002T",
DevSize: SIZE_256KiB, .DevSize = SIZE_256KiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,3), .regions = {ERASEINFO(0x10000,3),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
...@@ -768,12 +768,12 @@ static const struct amd_flash_info jedec_table[] = { ...@@ -768,12 +768,12 @@ static const struct amd_flash_info jedec_table[] = {
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_HYUNDAI, .mfr_id = MANUFACTURER_HYUNDAI,
dev_id: HY29F002T, .dev_id = HY29F002T,
name: "Hyundai HY29F002T", .name = "Hyundai HY29F002T",
DevSize: SIZE_256KiB, .DevSize = SIZE_256KiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,3), .regions = {ERASEINFO(0x10000,3),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
...@@ -1162,12 +1162,12 @@ static const struct amd_flash_info jedec_table[] = { ...@@ -1162,12 +1162,12 @@ static const struct amd_flash_info jedec_table[] = {
ERASEINFO(0x10000,7), ERASEINFO(0x10000,7),
} }
}, { }, {
mfr_id: MANUFACTURER_MACRONIX, .mfr_id = MANUFACTURER_MACRONIX,
dev_id: MX29F002T, .dev_id = MX29F002T,
name: "Macronix MX29F002T", .name = "Macronix MX29F002T",
DevSize: SIZE_256KiB, .DevSize = SIZE_256KiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,3), .regions = {ERASEINFO(0x10000,3),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
...@@ -1247,7 +1247,7 @@ static const struct amd_flash_info jedec_table[] = { ...@@ -1247,7 +1247,7 @@ static const struct amd_flash_info jedec_table[] = {
.DevSize = SIZE_256KiB, .DevSize = SIZE_256KiB,
.CmdSet = P_ID_SST_PAGE, .CmdSet = P_ID_SST_PAGE,
.NumEraseRegions= 1, .NumEraseRegions= 1,
regions: {ERASEINFO(0x01000,64), .regions = {ERASEINFO(0x01000,64),
} }
}, { }, {
.mfr_id = MANUFACTURER_SST, .mfr_id = MANUFACTURER_SST,
...@@ -1259,7 +1259,7 @@ static const struct amd_flash_info jedec_table[] = { ...@@ -1259,7 +1259,7 @@ static const struct amd_flash_info jedec_table[] = {
.DevSize = SIZE_256KiB, .DevSize = SIZE_256KiB,
.CmdSet = P_ID_SST_PAGE, .CmdSet = P_ID_SST_PAGE,
.NumEraseRegions= 1, .NumEraseRegions= 1,
regions: {ERASEINFO(0x01000,64), .regions = {ERASEINFO(0x01000,64),
} }
}, { }, {
.mfr_id = MANUFACTURER_SST, .mfr_id = MANUFACTURER_SST,
......
drivers/net/s2io.c
View file @ f5f11ecb
...@@ -235,10 +235,10 @@ static struct pci_device_id s2io_tbl[] __devinitdata = { ...@@ -235,10 +235,10 @@ static struct pci_device_id s2io_tbl[] __devinitdata = {
MODULE_DEVICE_TABLE(pci, s2io_tbl); MODULE_DEVICE_TABLE(pci, s2io_tbl);
static struct pci_driver s2io_driver = { static struct pci_driver s2io_driver = {
name:"S2IO", .name = "S2IO",
id_table:s2io_tbl, .id_table = s2io_tbl,
probe:s2io_init_nic, .probe = s2io_init_nic,
remove:__devexit_p(s2io_rem_nic), .remove = __devexit_p(s2io_rem_nic),
}; };
/* /*
......
fs/reiserfs/xattr_acl.c
View file @ f5f11ecb
...@@ -508,11 +508,11 @@ posix_acl_access_list (struct inode *inode, const char *name, int namelen, char ...@@ -508,11 +508,11 @@ posix_acl_access_list (struct inode *inode, const char *name, int namelen, char
} }
struct reiserfs_xattr_handler posix_acl_access_handler = { struct reiserfs_xattr_handler posix_acl_access_handler = {
prefix: XATTR_NAME_ACL_ACCESS, .prefix = XATTR_NAME_ACL_ACCESS,
get: posix_acl_access_get, .get = posix_acl_access_get,
set: posix_acl_access_set, .set = posix_acl_access_set,
del: posix_acl_access_del, .del = posix_acl_access_del,
list: posix_acl_access_list, .list = posix_acl_access_list,
}; };
static int static int
...@@ -561,9 +561,9 @@ posix_acl_default_list (struct inode *inode, const char *name, int namelen, char ...@@ -561,9 +561,9 @@ posix_acl_default_list (struct inode *inode, const char *name, int namelen, char
} }
struct reiserfs_xattr_handler posix_acl_default_handler = { struct reiserfs_xattr_handler posix_acl_default_handler = {
prefix: XATTR_NAME_ACL_DEFAULT, .prefix = XATTR_NAME_ACL_DEFAULT,
get: posix_acl_default_get, .get = posix_acl_default_get,
set: posix_acl_default_set, .set = posix_acl_default_set,
del: posix_acl_default_del, .del = posix_acl_default_del,
list: posix_acl_default_list, .list = posix_acl_default_list,
}; };
fs/reiserfs/xattr_security.c
View file @ f5f11ecb
...@@ -61,9 +61,9 @@ security_list (struct inode *inode, const char *name, int namelen, char *out) ...@@ -61,9 +61,9 @@ security_list (struct inode *inode, const char *name, int namelen, char *out)
struct reiserfs_xattr_handler security_handler = { struct reiserfs_xattr_handler security_handler = {
prefix: XATTR_SECURITY_PREFIX, .prefix = XATTR_SECURITY_PREFIX,
get: security_get, .get = security_get,
set: security_set, .set = security_set,
del: security_del, .del = security_del,
list: security_list, .list = security_list,
}; };
fs/reiserfs/xattr_trusted.c
View file @ f5f11ecb
...@@ -73,9 +73,9 @@ trusted_list (struct inode *inode, const char *name, int namelen, char *out) ...@@ -73,9 +73,9 @@ trusted_list (struct inode *inode, const char *name, int namelen, char *out)
struct reiserfs_xattr_handler trusted_handler = { struct reiserfs_xattr_handler trusted_handler = {
prefix: XATTR_TRUSTED_PREFIX, .prefix = XATTR_TRUSTED_PREFIX,
get: trusted_get, .get = trusted_get,
set: trusted_set, .set = trusted_set,
del: trusted_del, .del = trusted_del,
list: trusted_list, .list = trusted_list,
}; };
fs/reiserfs/xattr_user.c
View file @ f5f11ecb
...@@ -91,9 +91,9 @@ user_list (struct inode *inode, const char *name, int namelen, char *out) ...@@ -91,9 +91,9 @@ user_list (struct inode *inode, const char *name, int namelen, char *out)
} }
struct reiserfs_xattr_handler user_handler = { struct reiserfs_xattr_handler user_handler = {
prefix: XATTR_USER_PREFIX, .prefix = XATTR_USER_PREFIX,
get: user_get, .get = user_get,
set: user_set, .set = user_set,
del: user_del, .del = user_del,
list: user_list, .list = user_list,
}; };
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7