[PATCH] more new struct initializers

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index 7e7503df711598e810c34fbfee17860bab4f3df4..ade872962c4ce8a95f31aedc306c07de0bc789db 100644 (file)
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -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 =
 {
-       ipmi_recv_hndl : receive_handler
+       .ipmi_recv_hndl = receive_handler
 };
 
 

diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 90581534f1af8804e691f8d603914d1705c91648..e3af0c0253f3ff1f5a44bac10ca22660b71ef200 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -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 = {
-        owner: THIS_MODULE,
-        read: dvb_ca_en50221_io_read,
-        write: dvb_ca_en50221_io_write,
-        ioctl: dvb_ca_en50221_io_ioctl,
-        open: dvb_ca_en50221_io_open,
-        release: dvb_ca_en50221_io_release,
-        poll: dvb_ca_en50221_io_poll,
+        .owner = THIS_MODULE,
+        .read = dvb_ca_en50221_io_read,
+        .write = dvb_ca_en50221_io_write,
+        .ioctl = dvb_ca_en50221_io_ioctl,
+        .open = dvb_ca_en50221_io_open,
+        .release = dvb_ca_en50221_io_release,
+        .poll = dvb_ca_en50221_io_poll,
 };
 
 static struct dvb_device dvbdev_ca = {
-        priv: NULL,
-        users: 1,
-        readers: 1,
-        writers: 1,
-        fops: &dvb_ca_fops,
+        .users = 1,
+        .readers = 1,
+        .writers = 1,
+        .fops = &dvb_ca_fops,
 };
 
 

diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index e2c50b9271a07d406895e7c7c3a87728ef4c6cd5..17c1dd32acd5097a56c09b5746cbcb91ddc3947d 100644 (file)
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -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)
 {
        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  */
@@ -1257,12 +1257,12 @@ static long probe_tuner (struct dvb_i2c_bus *i2c)
         u8 stat [] = { 0 };
        u8 tda6100_buf [] = { 0, 0 };
        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 }};
-       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 }};
-       struct i2c_msg msg3 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt,  len: 2 },
-                          { .addr = 0x60, .flags = 0, .buf = tda6100_buf, .len = 2 }};
+       struct i2c_msg msg3 [] = {{ .addr = 0x68, .buf = rpt,  .len = 2 },
+                          { .addr = 0x60, .buf = tda6100_buf, .len = 2 }};
 
        stv0299_writereg (i2c, 0x01, 0x15);
        stv0299_writereg (i2c, 0x02, 0x30);

diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index b6ae9482443a7ff92c10db8ff7fb351c785f8de5..8fb85f079111939d85618b0fababe810051786a0 100644 (file)
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -512,12 +512,12 @@ static const struct amd_flash_info jedec_table[] = {
                        ERASEINFO(0x10000,8),
                }
        }, {
-               mfr_id: MANUFACTURER_AMD,
-               dev_id: AM29F002T,
-               name: "AMD AM29F002T",
-               DevSize: SIZE_256KiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,3),
+               .mfr_id = MANUFACTURER_AMD,
+               .dev_id = AM29F002T,
+               .name = "AMD AM29F002T",
+               .DevSize = SIZE_256KiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,3),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
@@ -768,12 +768,12 @@ static const struct amd_flash_info jedec_table[] = {
                        ERASEINFO(0x04000,1)
                }
        }, {
-               mfr_id: MANUFACTURER_HYUNDAI,
-               dev_id: HY29F002T,
-               name: "Hyundai HY29F002T",
-               DevSize: SIZE_256KiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,3),
+               .mfr_id = MANUFACTURER_HYUNDAI,
+               .dev_id = HY29F002T,
+               .name = "Hyundai HY29F002T",
+               .DevSize = SIZE_256KiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,3),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
@@ -1162,12 +1162,12 @@ static const struct amd_flash_info jedec_table[] = {
                        ERASEINFO(0x10000,7),
                }
        }, {
-               mfr_id: MANUFACTURER_MACRONIX,
-               dev_id: MX29F002T,
-               name: "Macronix MX29F002T",
-               DevSize: SIZE_256KiB,
-               NumEraseRegions: 4,
-               regions: {ERASEINFO(0x10000,3),
+               .mfr_id = MANUFACTURER_MACRONIX,
+               .dev_id = MX29F002T,
+               .name = "Macronix MX29F002T",
+               .DevSize = SIZE_256KiB,
+               .NumEraseRegions = 4,
+               .regions = {ERASEINFO(0x10000,3),
                          ERASEINFO(0x08000,1),
                          ERASEINFO(0x02000,2),
                          ERASEINFO(0x04000,1)
@@ -1247,7 +1247,7 @@ static const struct amd_flash_info jedec_table[] = {
                .DevSize        = SIZE_256KiB,
                .CmdSet         = P_ID_SST_PAGE,
                .NumEraseRegions= 1,
-               regions: {ERASEINFO(0x01000,64),
+               .regions = {ERASEINFO(0x01000,64),
                }
          }, {
                .mfr_id         = MANUFACTURER_SST,
@@ -1259,7 +1259,7 @@ static const struct amd_flash_info jedec_table[] = {
                .DevSize        = SIZE_256KiB,
                .CmdSet         = P_ID_SST_PAGE,
                .NumEraseRegions= 1,
-               regions: {ERASEINFO(0x01000,64),
+               .regions = {ERASEINFO(0x01000,64),
                }
        }, {
                .mfr_id         = MANUFACTURER_SST,

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index c4bd1793f99320f57c396c649958edefe1d8a7f7..c68c1c0e7163926950a0129e71bba1faf4dc6f03 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -235,10 +235,10 @@ static struct pci_device_id s2io_tbl[] __devinitdata = {
 MODULE_DEVICE_TABLE(pci, s2io_tbl);
 
 static struct pci_driver s2io_driver = {
-      name:"S2IO",
-      id_table:s2io_tbl,
-      probe:s2io_init_nic,
-      remove:__devexit_p(s2io_rem_nic),
+      .name = "S2IO",
+      .id_table = s2io_tbl,
+      .probe = s2io_init_nic,
+      .remove = __devexit_p(s2io_rem_nic),
 };
 
 /*  

diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index a1daab81c8301f3853692a2bfb396a011c3ef69a..b600930ffd8e4b44675de68c70de268051b56b35 100644 (file)
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -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 = {
-    prefix: XATTR_NAME_ACL_ACCESS,
-    get: posix_acl_access_get,
-    set: posix_acl_access_set,
-    del: posix_acl_access_del,
-    list: posix_acl_access_list,
+       .prefix = XATTR_NAME_ACL_ACCESS,
+       .get = posix_acl_access_get,
+       .set = posix_acl_access_set,
+       .del = posix_acl_access_del,
+       .list = posix_acl_access_list,
 };
 
 static int
@@ -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 = {
-    prefix: XATTR_NAME_ACL_DEFAULT,
-    get: posix_acl_default_get,
-    set: posix_acl_default_set,
-    del: posix_acl_default_del,
-    list: posix_acl_default_list,
+       .prefix = XATTR_NAME_ACL_DEFAULT,
+       .get = posix_acl_default_get,
+       .set = posix_acl_default_set,
+       .del = posix_acl_default_del,
+       .list = posix_acl_default_list,
 };

diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c
index eacbdca4359d2e9afdd4ec4bcb2997387b99a9d9..e044d5117117f46eab4179308ee3c6d212e05ddf 100644 (file)
--- a/fs/reiserfs/xattr_security.c
+++ b/fs/reiserfs/xattr_security.c
@@ -61,9 +61,9 @@ security_list (struct inode *inode, const char *name, int namelen, char *out)
 
 
 struct reiserfs_xattr_handler security_handler = {
-    prefix: XATTR_SECURITY_PREFIX,
-    get: security_get,
-    set: security_set,
-    del: security_del,
-    list: security_list,
+       .prefix = XATTR_SECURITY_PREFIX,
+       .get = security_get,
+       .set = security_set,
+       .del = security_del,
+       .list = security_list,
 };

diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c
index 39a10ec8c27d9062eb6abe42011540eb8e54518d..43762197fb0a521174806462fa8022b729113631 100644 (file)
--- a/fs/reiserfs/xattr_trusted.c
+++ b/fs/reiserfs/xattr_trusted.c
@@ -73,9 +73,9 @@ trusted_list (struct inode *inode, const char *name, int namelen, char *out)
 
 
 struct reiserfs_xattr_handler trusted_handler = {
-    prefix: XATTR_TRUSTED_PREFIX,
-    get: trusted_get,
-    set: trusted_set,
-    del: trusted_del,
-    list: trusted_list,
+       .prefix = XATTR_TRUSTED_PREFIX,
+       .get = trusted_get,
+       .set = trusted_set,
+       .del = trusted_del,
+       .list = trusted_list,
 };

diff --git a/fs/reiserfs/xattr_user.c b/fs/reiserfs/xattr_user.c
index 38779f3fd314ad48735314a79c3221eb73d61766..0772806466a867de2945ecd27fcc9195c9e000ca 100644 (file)
--- a/fs/reiserfs/xattr_user.c
+++ b/fs/reiserfs/xattr_user.c
@@ -91,9 +91,9 @@ user_list (struct inode *inode, const char *name, int namelen, char *out)
 }
 
 struct reiserfs_xattr_handler user_handler = {
-    prefix: XATTR_USER_PREFIX,
-    get: user_get,
-    set: user_set,
-    del: user_del,
-    list: user_list,
+       .prefix = XATTR_USER_PREFIX,
+       .get = user_get,
+       .set = user_set,
+       .del = user_del,
+       .list = user_list,
 };