Skip to content

L
linux
Commit ab9c9f80 authored by Art Haas's avatar Art Haas Committed by Linus Torvalds
Browse files
Options

[PATCH] C99 initializers for drivers/mtd/chips

parent c6ad60b9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 338 additions and 301 deletions
drivers/mtd/chips/amd_flash.c
View file @ ab9c9f80
This diff is collapsed.
drivers/mtd/chips/cfi_cmdset_0001.c
View file @ ab9c9f80
...@@ -47,10 +47,10 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *, int); ...@@ -47,10 +47,10 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *, int);
static struct mtd_info *cfi_intelext_setup (struct map_info *); static struct mtd_info *cfi_intelext_setup (struct map_info *);
static struct mtd_chip_driver cfi_intelext_chipdrv = { static struct mtd_chip_driver cfi_intelext_chipdrv = {
probe: NULL, /* Not usable directly */ .probe = NULL, /* Not usable directly */
destroy: cfi_intelext_destroy, .destroy = cfi_intelext_destroy,
name: "cfi_cmdset_0001", .name = "cfi_cmdset_0001",
module: THIS_MODULE .module = THIS_MODULE
}; };
/* #define DEBUG_LOCK_BITS */ /* #define DEBUG_LOCK_BITS */
......
drivers/mtd/chips/cfi_cmdset_0002.c
View file @ ab9c9f80
...@@ -43,10 +43,10 @@ static struct mtd_info *cfi_amdstd_setup (struct map_info *); ...@@ -43,10 +43,10 @@ static struct mtd_info *cfi_amdstd_setup (struct map_info *);
static struct mtd_chip_driver cfi_amdstd_chipdrv = { static struct mtd_chip_driver cfi_amdstd_chipdrv = {
probe: NULL, /* Not usable directly */ .probe = NULL, /* Not usable directly */
destroy: cfi_amdstd_destroy, .destroy = cfi_amdstd_destroy,
name: "cfi_cmdset_0002", .name = "cfi_cmdset_0002",
module: THIS_MODULE .module = THIS_MODULE
}; };
struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
......
drivers/mtd/chips/cfi_probe.c
View file @ ab9c9f80
...@@ -294,8 +294,8 @@ static void print_cfi_ident(struct cfi_ident *cfip) ...@@ -294,8 +294,8 @@ static void print_cfi_ident(struct cfi_ident *cfip)
#endif /* DEBUG_CFI */ #endif /* DEBUG_CFI */
static struct chip_probe cfi_chip_probe = { static struct chip_probe cfi_chip_probe = {
name: "CFI", .name = "CFI",
probe_chip: cfi_probe_chip .probe_chip = cfi_probe_chip
}; };
struct mtd_info *cfi_probe(struct map_info *map) struct mtd_info *cfi_probe(struct map_info *map)
...@@ -308,9 +308,9 @@ struct mtd_info *cfi_probe(struct map_info *map) ...@@ -308,9 +308,9 @@ struct mtd_info *cfi_probe(struct map_info *map)
} }
static struct mtd_chip_driver cfi_chipdrv = { static struct mtd_chip_driver cfi_chipdrv = {
probe: cfi_probe, .probe = cfi_probe,
name: "cfi_probe", .name = "cfi_probe",
module: THIS_MODULE .module = THIS_MODULE
}; };
int __init cfi_probe_init(void) int __init cfi_probe_init(void)
......
drivers/mtd/chips/jedec.c
View file @ ab9c9f80
...@@ -33,14 +33,51 @@ static unsigned long my_bank_size; ...@@ -33,14 +33,51 @@ static unsigned long my_bank_size;
/* Listing of parts and sizes. We need this table to learn the sector /* Listing of parts and sizes. We need this table to learn the sector
size of the chip and the total length */ size of the chip and the total length */
static const struct JEDECTable JEDEC_table[] = static const struct JEDECTable JEDEC_table[] = {
{{0x013D,"AMD Am29F017D",2*1024*1024,64*1024,MTD_CAP_NORFLASH}, {
{0x01AD,"AMD Am29F016",2*1024*1024,64*1024,MTD_CAP_NORFLASH}, .jedec = 0x013D,
{0x01D5,"AMD Am29F080",1*1024*1024,64*1024,MTD_CAP_NORFLASH}, .name = "AMD Am29F017D",
{0x01A4,"AMD Am29F040",512*1024,64*1024,MTD_CAP_NORFLASH}, .size = 2*1024*1024,
{0x20E3,"AMD Am29W040B",512*1024,64*1024,MTD_CAP_NORFLASH}, .sectorsize = 64*1024,
{0xC2AD,"Macronix MX29F016",2*1024*1024,64*1024,MTD_CAP_NORFLASH}, .capabilities = MTD_CAP_NORFLASH
{}}; },
{
.jedec = 0x01AD,
.name = "AMD Am29F016",
.size = 2*1024*1024,
.sectorsize = 64*1024,
.capabilities = MTD_CAP_NORFLASH
},
{
.jedec = 0x01D5,
.name = "AMD Am29F080",
.size = 1*1024*1024,
.sectorsize = 64*1024,
.capabilities = MTD_CAP_NORFLASH
},
{
.jedec = 0x01A4,
.name = "AMD Am29F040",
.size = 512*1024,
.sectorsize = 64*1024,
.capabilities = MTD_CAP_NORFLASH
},
{
.jedec = 0x20E3,
.name = "AMD Am29W040B",
.size = 512*1024,
.sectorsize = 64*1024,
.capabilities = MTD_CAP_NORFLASH
},
{
.jedec = 0xC2AD,
.name = "Macronix MX29F016",
.size = 2*1024*1024,
.sectorsize = 64*1024,
.capabilities = MTD_CAP_NORFLASH
},
{ .jedec = 0x0 }
};
static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id); static const struct JEDECTable *jedec_idtoinf(__u8 mfr,__u8 id);
static void jedec_sync(struct mtd_info *mtd) {}; static void jedec_sync(struct mtd_info *mtd) {};
...@@ -54,9 +91,9 @@ static struct mtd_info *jedec_probe(struct map_info *map); ...@@ -54,9 +91,9 @@ static struct mtd_info *jedec_probe(struct map_info *map);
static struct mtd_chip_driver jedec_chipdrv = { static struct mtd_chip_driver jedec_chipdrv = {
probe: jedec_probe, .probe = jedec_probe,
name: "jedec", .name = "jedec",
module: THIS_MODULE .module = THIS_MODULE
}; };
/* Probe entry point */ /* Probe entry point */
......
drivers/mtd/chips/jedec_probe.c
View file @ ab9c9f80
...@@ -75,176 +75,176 @@ struct amd_flash_info { ...@@ -75,176 +75,176 @@ struct amd_flash_info {
static const struct amd_flash_info jedec_table[] = { static const struct amd_flash_info jedec_table[] = {
{ {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29LV160DT, .dev_id = AM29LV160DT,
name: "AMD AM29LV160DT", .name = "AMD AM29LV160DT",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,31), .regions = {ERASEINFO(0x10000,31),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29LV160DB, .dev_id = AM29LV160DB,
name: "AMD AM29LV160DB", .name = "AMD AM29LV160DB",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x04000,1), .regions = {ERASEINFO(0x04000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x10000,31) ERASEINFO(0x10000,31)
} }
}, { }, {
mfr_id: MANUFACTURER_TOSHIBA, .mfr_id = MANUFACTURER_TOSHIBA,
dev_id: TC58FVT160, .dev_id = TC58FVT160,
name: "Toshiba TC58FVT160", .name = "Toshiba TC58FVT160",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,31), .regions = {ERASEINFO(0x10000,31),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_FUJITSU, .mfr_id = MANUFACTURER_FUJITSU,
dev_id: MBM29LV160TE, .dev_id = MBM29LV160TE,
name: "Fujitsu MBM29LV160TE", .name = "Fujitsu MBM29LV160TE",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,31), .regions = {ERASEINFO(0x10000,31),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_TOSHIBA, .mfr_id = MANUFACTURER_TOSHIBA,
dev_id: TC58FVB160, .dev_id = TC58FVB160,
name: "Toshiba TC58FVB160", .name = "Toshiba TC58FVB160",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x04000,1), .regions = {ERASEINFO(0x04000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x10000,31) ERASEINFO(0x10000,31)
} }
}, { }, {
mfr_id: MANUFACTURER_FUJITSU, .mfr_id = MANUFACTURER_FUJITSU,
dev_id: MBM29LV160BE, .dev_id = MBM29LV160BE,
name: "Fujitsu MBM29LV160BE", .name = "Fujitsu MBM29LV160BE",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x04000,1), .regions = {ERASEINFO(0x04000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x10000,31) ERASEINFO(0x10000,31)
} }
}, { }, {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29LV800BB, .dev_id = AM29LV800BB,
name: "AMD AM29LV800BB", .name = "AMD AM29LV800BB",
DevSize: SIZE_1MiB, .DevSize = SIZE_1MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x04000,1), .regions = {ERASEINFO(0x04000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x10000,15), ERASEINFO(0x10000,15),
} }
}, { }, {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29F800BB, .dev_id = AM29F800BB,
name: "AMD AM29F800BB", .name = "AMD AM29F800BB",
DevSize: SIZE_1MiB, .DevSize = SIZE_1MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x04000,1), .regions = {ERASEINFO(0x04000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x10000,15), ERASEINFO(0x10000,15),
} }
}, { }, {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29LV800BT, .dev_id = AM29LV800BT,
name: "AMD AM29LV800BT", .name = "AMD AM29LV800BT",
DevSize: SIZE_1MiB, .DevSize = SIZE_1MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,15), .regions = {ERASEINFO(0x10000,15),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29F800BT, .dev_id = AM29F800BT,
name: "AMD AM29F800BT", .name = "AMD AM29F800BT",
DevSize: SIZE_1MiB, .DevSize = SIZE_1MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,15), .regions = {ERASEINFO(0x10000,15),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
dev_id: AM29LV800BB, .dev_id = AM29LV800BB,
name: "AMD AM29LV800BB", .name = "AMD AM29LV800BB",
DevSize: SIZE_1MiB, .DevSize = SIZE_1MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,15), .regions = {ERASEINFO(0x10000,15),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_ST, .mfr_id = MANUFACTURER_ST,
dev_id: M29W800T, .dev_id = M29W800T,
name: "ST M29W800T", .name = "ST M29W800T",
DevSize: SIZE_1MiB, .DevSize = SIZE_1MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,15), .regions = {ERASEINFO(0x10000,15),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_ST, .mfr_id = MANUFACTURER_ST,
dev_id: M29W160DT, .dev_id = M29W160DT,
name: "ST M29W160DT", .name = "ST M29W160DT",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x10000,31), .regions = {ERASEINFO(0x10000,31),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x04000,1) ERASEINFO(0x04000,1)
} }
}, { }, {
mfr_id: MANUFACTURER_ST, .mfr_id = MANUFACTURER_ST,
dev_id: M29W160DB, .dev_id = M29W160DB,
name: "ST M29W160DB", .name = "ST M29W160DB",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 4, .NumEraseRegions = 4,
regions: {ERASEINFO(0x04000,1), .regions = {ERASEINFO(0x04000,1),
ERASEINFO(0x02000,2), ERASEINFO(0x02000,2),
ERASEINFO(0x08000,1), ERASEINFO(0x08000,1),
ERASEINFO(0x10000,31) ERASEINFO(0x10000,31)
} }
}, { }, {
mfr_id: MANUFACTURER_ATMEL, .mfr_id = MANUFACTURER_ATMEL,
dev_id: AT49BV16X4, .dev_id = AT49BV16X4,
name: "Atmel AT49BV16X4", .name = "Atmel AT49BV16X4",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 3, .NumEraseRegions = 3,
regions: {ERASEINFO(0x02000,8), .regions = {ERASEINFO(0x02000,8),
ERASEINFO(0x08000,2), ERASEINFO(0x08000,2),
ERASEINFO(0x10000,30) ERASEINFO(0x10000,30)
} }
}, { }, {
mfr_id: MANUFACTURER_ATMEL, .mfr_id = MANUFACTURER_ATMEL,
dev_id: AT49BV16X4T, .dev_id = AT49BV16X4T,
name: "Atmel AT49BV16X4T", .name = "Atmel AT49BV16X4T",
DevSize: SIZE_2MiB, .DevSize = SIZE_2MiB,
NumEraseRegions: 3, .NumEraseRegions = 3,
regions: {ERASEINFO(0x10000,30), .regions = {ERASEINFO(0x10000,30),
ERASEINFO(0x08000,2), ERASEINFO(0x08000,2),
ERASEINFO(0x02000,8) ERASEINFO(0x02000,8)
} }
...@@ -403,8 +403,8 @@ static int jedec_probe_chip(struct map_info *map, __u32 base, ...@@ -403,8 +403,8 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
} }
static struct chip_probe jedec_chip_probe = { static struct chip_probe jedec_chip_probe = {
name: "JEDEC", .name = "JEDEC",
probe_chip: jedec_probe_chip .probe_chip = jedec_probe_chip
}; };
struct mtd_info *jedec_probe(struct map_info *map) struct mtd_info *jedec_probe(struct map_info *map)
...@@ -417,9 +417,9 @@ struct mtd_info *jedec_probe(struct map_info *map) ...@@ -417,9 +417,9 @@ struct mtd_info *jedec_probe(struct map_info *map)
} }
static struct mtd_chip_driver jedec_chipdrv = { static struct mtd_chip_driver jedec_chipdrv = {
probe: jedec_probe, .probe = jedec_probe,
name: "jedec_probe", .name = "jedec_probe",
module: THIS_MODULE .module = THIS_MODULE
}; };
int __init jedec_probe_init(void) int __init jedec_probe_init(void)
......
drivers/mtd/chips/map_absent.c
View file @ ab9c9f80
...@@ -36,10 +36,10 @@ static void map_absent_destroy (struct mtd_info *); ...@@ -36,10 +36,10 @@ static void map_absent_destroy (struct mtd_info *);
static struct mtd_chip_driver map_absent_chipdrv = { static struct mtd_chip_driver map_absent_chipdrv = {
probe: map_absent_probe, .probe = map_absent_probe,
destroy: map_absent_destroy, .destroy = map_absent_destroy,
name: "map_absent", .name = "map_absent",
module: THIS_MODULE .module = THIS_MODULE
}; };
static struct mtd_info *map_absent_probe(struct map_info *map) static struct mtd_info *map_absent_probe(struct map_info *map)
......
drivers/mtd/chips/map_ram.c
View file @ ab9c9f80
...@@ -23,9 +23,9 @@ static struct mtd_info *map_ram_probe(struct map_info *map); ...@@ -23,9 +23,9 @@ static struct mtd_info *map_ram_probe(struct map_info *map);
static struct mtd_chip_driver mapram_chipdrv = { static struct mtd_chip_driver mapram_chipdrv = {
probe: map_ram_probe, .probe = map_ram_probe,
name: "map_ram", .name = "map_ram",
module: THIS_MODULE .module = THIS_MODULE
}; };
static struct mtd_info *map_ram_probe(struct map_info *map) static struct mtd_info *map_ram_probe(struct map_info *map)
......
drivers/mtd/chips/map_rom.c
View file @ ab9c9f80
...@@ -21,9 +21,9 @@ static void maprom_nop (struct mtd_info *); ...@@ -21,9 +21,9 @@ static void maprom_nop (struct mtd_info *);
struct mtd_info *map_rom_probe(struct map_info *map); struct mtd_info *map_rom_probe(struct map_info *map);
static struct mtd_chip_driver maprom_chipdrv = { static struct mtd_chip_driver maprom_chipdrv = {
probe: map_rom_probe, .probe = map_rom_probe,
name: "map_rom", .name = "map_rom",
module: THIS_MODULE .module = THIS_MODULE
}; };
struct mtd_info *map_rom_probe(struct map_info *map) struct mtd_info *map_rom_probe(struct map_info *map)
......
drivers/mtd/chips/sharp.c
View file @ ab9c9f80
...@@ -98,10 +98,10 @@ struct mtd_info *sharp_probe(struct map_info *map); ...@@ -98,10 +98,10 @@ struct mtd_info *sharp_probe(struct map_info *map);
static void sharp_destroy(struct mtd_info *mtd); static void sharp_destroy(struct mtd_info *mtd);
static struct mtd_chip_driver sharp_chipdrv = { static struct mtd_chip_driver sharp_chipdrv = {
probe: sharp_probe, .probe = sharp_probe,
destroy: sharp_destroy, .destroy = sharp_destroy,
name: "sharp", .name = "sharp",
module: THIS_MODULE .module = THIS_MODULE
}; };
......
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