Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mtd: remove junk tabs in nand.h

Remove tabs between type and name.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

authored by

Sebastian Andrzej Siewior and committed by
David Woodhouse
b46daf7e a0491fc4

+143 -164
+143 -164
include/linux/mtd/nand.h
··· 253 253 254 254 struct nand_onfi_params { 255 255 /* rev info and features block */ 256 - u8 sig[4]; /* 'O' 'N' 'F' 'I' */ 257 - __le16 revision; 258 - __le16 features; 259 - __le16 opt_cmd; 260 - u8 reserved[22]; 256 + /* 'O' 'N' 'F' 'I' */ 257 + u8 sig[4]; 258 + __le16 revision; 259 + __le16 features; 260 + __le16 opt_cmd; 261 + u8 reserved[22]; 261 262 262 263 /* manufacturer information block */ 263 - char manufacturer[12]; 264 - char model[20]; 265 - u8 jedec_id; 266 - __le16 date_code; 267 - u8 reserved2[13]; 264 + char manufacturer[12]; 265 + char model[20]; 266 + u8 jedec_id; 267 + __le16 date_code; 268 + u8 reserved2[13]; 268 269 269 270 /* memory organization block */ 270 - __le32 byte_per_page; 271 - __le16 spare_bytes_per_page; 272 - __le32 data_bytes_per_ppage; 273 - __le16 spare_bytes_per_ppage; 274 - __le32 pages_per_block; 275 - __le32 blocks_per_lun; 276 - u8 lun_count; 277 - u8 addr_cycles; 278 - u8 bits_per_cell; 279 - __le16 bb_per_lun; 280 - __le16 block_endurance; 281 - u8 guaranteed_good_blocks; 282 - __le16 guaranteed_block_endurance; 283 - u8 programs_per_page; 284 - u8 ppage_attr; 285 - u8 ecc_bits; 286 - u8 interleaved_bits; 287 - u8 interleaved_ops; 288 - u8 reserved3[13]; 271 + __le32 byte_per_page; 272 + __le16 spare_bytes_per_page; 273 + __le32 data_bytes_per_ppage; 274 + __le16 spare_bytes_per_ppage; 275 + __le32 pages_per_block; 276 + __le32 blocks_per_lun; 277 + u8 lun_count; 278 + u8 addr_cycles; 279 + u8 bits_per_cell; 280 + __le16 bb_per_lun; 281 + __le16 block_endurance; 282 + u8 guaranteed_good_blocks; 283 + __le16 guaranteed_block_endurance; 284 + u8 programs_per_page; 285 + u8 ppage_attr; 286 + u8 ecc_bits; 287 + u8 interleaved_bits; 288 + u8 interleaved_ops; 289 + u8 reserved3[13]; 289 290 290 291 /* electrical parameter block */ 291 - u8 io_pin_capacitance_max; 292 - __le16 async_timing_mode; 293 - __le16 program_cache_timing_mode; 294 - __le16 t_prog; 295 - __le16 t_bers; 296 - __le16 t_r; 297 - __le16 t_ccs; 298 - __le16 src_sync_timing_mode; 299 - __le16 src_ssync_features; 300 - __le16 clk_pin_capacitance_typ; 301 - __le16 io_pin_capacitance_typ; 302 - __le16 input_pin_capacitance_typ; 303 - u8 input_pin_capacitance_max; 304 - u8 driver_strenght_support; 305 - __le16 t_int_r; 306 - __le16 t_ald; 307 - u8 reserved4[7]; 292 + u8 io_pin_capacitance_max; 293 + __le16 async_timing_mode; 294 + __le16 program_cache_timing_mode; 295 + __le16 t_prog; 296 + __le16 t_bers; 297 + __le16 t_r; 298 + __le16 t_ccs; 299 + __le16 src_sync_timing_mode; 300 + __le16 src_ssync_features; 301 + __le16 clk_pin_capacitance_typ; 302 + __le16 io_pin_capacitance_typ; 303 + __le16 input_pin_capacitance_typ; 304 + u8 input_pin_capacitance_max; 305 + u8 driver_strenght_support; 306 + __le16 t_int_r; 307 + __le16 t_ald; 308 + u8 reserved4[7]; 308 309 309 310 /* vendor */ 310 - u8 reserved5[90]; 311 + u8 reserved5[90]; 311 312 312 313 __le16 crc; 313 314 } __attribute__((packed)); ··· 324 323 * when a hw controller is available. 325 324 */ 326 325 struct nand_hw_control { 327 - spinlock_t lock; 326 + spinlock_t lock; 328 327 struct nand_chip *active; 329 328 wait_queue_head_t wq; 330 329 }; ··· 354 353 * @write_oob: function to write chip OOB data 355 354 */ 356 355 struct nand_ecc_ctrl { 357 - nand_ecc_modes_t mode; 358 - int steps; 359 - int size; 360 - int bytes; 361 - int total; 362 - int prepad; 363 - int postpad; 356 + nand_ecc_modes_t mode; 357 + int steps; 358 + int size; 359 + int bytes; 360 + int total; 361 + int prepad; 362 + int postpad; 364 363 struct nand_ecclayout *layout; 365 - void (*hwctl)(struct mtd_info *mtd, int mode); 366 - int (*calculate)(struct mtd_info *mtd, 367 - const uint8_t *dat, 368 - uint8_t *ecc_code); 369 - int (*correct)(struct mtd_info *mtd, uint8_t *dat, 370 - uint8_t *read_ecc, 371 - uint8_t *calc_ecc); 372 - int (*read_page_raw)(struct mtd_info *mtd, 373 - struct nand_chip *chip, 374 - uint8_t *buf, int page); 375 - void (*write_page_raw)(struct mtd_info *mtd, 376 - struct nand_chip *chip, 377 - const uint8_t *buf); 378 - int (*read_page)(struct mtd_info *mtd, 379 - struct nand_chip *chip, 380 - uint8_t *buf, int page); 381 - int (*read_subpage)(struct mtd_info *mtd, 382 - struct nand_chip *chip, 383 - uint32_t offs, uint32_t len, 384 - uint8_t *buf); 385 - void (*write_page)(struct mtd_info *mtd, 386 - struct nand_chip *chip, 387 - const uint8_t *buf); 388 - int (*read_oob)(struct mtd_info *mtd, 389 - struct nand_chip *chip, 390 - int page, 391 - int sndcmd); 392 - int (*write_oob)(struct mtd_info *mtd, 393 - struct nand_chip *chip, 394 - int page); 364 + void (*hwctl)(struct mtd_info *mtd, int mode); 365 + int (*calculate)(struct mtd_info *mtd, const uint8_t *dat, 366 + uint8_t *ecc_code); 367 + int (*correct)(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc, 368 + uint8_t *calc_ecc); 369 + int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip, 370 + uint8_t *buf, int page); 371 + void (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip, 372 + const uint8_t *buf); 373 + int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, 374 + uint8_t *buf, int page); 375 + int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip, 376 + uint32_t offs, uint32_t len, uint8_t *buf); 377 + void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip, 378 + const uint8_t *buf); 379 + int (*read_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page, 380 + int sndcmd); 381 + int (*write_oob)(struct mtd_info *mtd, struct nand_chip *chip, 382 + int page); 395 383 }; 396 384 397 385 /** ··· 477 487 */ 478 488 479 489 struct nand_chip { 480 - void __iomem *IO_ADDR_R; 481 - void __iomem *IO_ADDR_W; 490 + void __iomem *IO_ADDR_R; 491 + void __iomem *IO_ADDR_W; 482 492 483 - uint8_t (*read_byte)(struct mtd_info *mtd); 484 - u16 (*read_word)(struct mtd_info *mtd); 485 - void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, 486 - int len); 487 - void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, 488 - int len); 489 - int (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, 490 - int len); 491 - void (*select_chip)(struct mtd_info *mtd, int chip); 492 - int (*block_bad)(struct mtd_info *mtd, loff_t ofs, 493 - int getchip); 494 - int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); 495 - void (*cmd_ctrl)(struct mtd_info *mtd, int dat, 496 - unsigned int ctrl); 497 - int (*init_size)(struct mtd_info *mtd, 498 - struct nand_chip *this, u8 *id_data); 499 - int (*dev_ready)(struct mtd_info *mtd); 500 - void (*cmdfunc)(struct mtd_info *mtd, unsigned command, 501 - int column, int page_addr); 502 - int (*waitfunc)(struct mtd_info *mtd, 503 - struct nand_chip *this); 504 - void (*erase_cmd)(struct mtd_info *mtd, int page); 505 - int (*scan_bbt)(struct mtd_info *mtd); 506 - int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, 507 - int state, int status, int page); 508 - int (*write_page)(struct mtd_info *mtd, 509 - struct nand_chip *chip, const uint8_t *buf, int page, 510 - int cached, int raw); 493 + uint8_t (*read_byte)(struct mtd_info *mtd); 494 + u16 (*read_word)(struct mtd_info *mtd); 495 + void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); 496 + void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len); 497 + int (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); 498 + void (*select_chip)(struct mtd_info *mtd, int chip); 499 + int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip); 500 + int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); 501 + void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl); 502 + int (*init_size)(struct mtd_info *mtd, struct nand_chip *this, 503 + u8 *id_data); 504 + int (*dev_ready)(struct mtd_info *mtd); 505 + void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, 506 + int page_addr); 507 + int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this); 508 + void (*erase_cmd)(struct mtd_info *mtd, int page); 509 + int (*scan_bbt)(struct mtd_info *mtd); 510 + int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state, 511 + int status, int page); 512 + int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip, 513 + const uint8_t *buf, int page, int cached, int raw); 511 514 512 - int chip_delay; 513 - unsigned int options; 515 + int chip_delay; 516 + unsigned int options; 514 517 515 - int page_shift; 516 - int phys_erase_shift; 517 - int bbt_erase_shift; 518 - int chip_shift; 519 - int numchips; 520 - uint64_t chipsize; 521 - int pagemask; 522 - int pagebuf; 523 - int subpagesize; 524 - uint8_t cellinfo; 525 - int badblockpos; 526 - int badblockbits; 518 + int page_shift; 519 + int phys_erase_shift; 520 + int bbt_erase_shift; 521 + int chip_shift; 522 + int numchips; 523 + uint64_t chipsize; 524 + int pagemask; 525 + int pagebuf; 526 + int subpagesize; 527 + uint8_t cellinfo; 528 + int badblockpos; 529 + int badblockbits; 527 530 528 - int onfi_version; 531 + int onfi_version; 529 532 struct nand_onfi_params onfi_params; 530 533 531 - flstate_t state; 534 + flstate_t state; 532 535 533 - uint8_t *oob_poi; 534 - struct nand_hw_control *controller; 535 - struct nand_ecclayout *ecclayout; 536 + uint8_t *oob_poi; 537 + struct nand_hw_control *controller; 538 + struct nand_ecclayout *ecclayout; 536 539 537 540 struct nand_ecc_ctrl ecc; 538 541 struct nand_buffers *buffers; ··· 533 550 534 551 struct mtd_oob_ops ops; 535 552 536 - uint8_t *bbt; 537 - struct nand_bbt_descr *bbt_td; 538 - struct nand_bbt_descr *bbt_md; 553 + uint8_t *bbt; 554 + struct nand_bbt_descr *bbt_td; 555 + struct nand_bbt_descr *bbt_md; 539 556 540 - struct nand_bbt_descr *badblock_pattern; 557 + struct nand_bbt_descr *badblock_pattern; 541 558 542 - void *priv; 559 + void *priv; 543 560 }; 544 561 545 562 /* ··· 612 629 * @priv: hardware controller specific settings 613 630 */ 614 631 struct platform_nand_chip { 615 - int nr_chips; 616 - int chip_offset; 617 - int nr_partitions; 618 - struct mtd_partition *partitions; 619 - struct nand_ecclayout *ecclayout; 620 - int chip_delay; 621 - unsigned int options; 622 - const char **part_probe_types; 623 - void (*set_parts)(uint64_t size, 624 - struct platform_nand_chip *chip); 625 - void *priv; 632 + int nr_chips; 633 + int chip_offset; 634 + int nr_partitions; 635 + struct mtd_partition *partitions; 636 + struct nand_ecclayout *ecclayout; 637 + int chip_delay; 638 + unsigned int options; 639 + const char **part_probe_types; 640 + void (*set_parts)(uint64_t size, struct platform_nand_chip *chip); 641 + void *priv; 626 642 }; 627 643 628 644 /* Keep gcc happy */ ··· 643 661 * All fields are optional and depend on the hardware driver requirements 644 662 */ 645 663 struct platform_nand_ctrl { 646 - int (*probe)(struct platform_device *pdev); 647 - void (*remove)(struct platform_device *pdev); 648 - void (*hwcontrol)(struct mtd_info *mtd, int cmd); 649 - int (*dev_ready)(struct mtd_info *mtd); 650 - void (*select_chip)(struct mtd_info *mtd, int chip); 651 - void (*cmd_ctrl)(struct mtd_info *mtd, int dat, 652 - unsigned int ctrl); 653 - void (*write_buf)(struct mtd_info *mtd, 654 - const uint8_t *buf, int len); 655 - void (*read_buf)(struct mtd_info *mtd, 656 - uint8_t *buf, int len); 657 - void *priv; 664 + int (*probe)(struct platform_device *pdev); 665 + void (*remove)(struct platform_device *pdev); 666 + void (*hwcontrol)(struct mtd_info *mtd, int cmd); 667 + int (*dev_ready)(struct mtd_info *mtd); 668 + void (*select_chip)(struct mtd_info *mtd, int chip); 669 + void (*cmd_ctrl)(struct mtd_info *mtd, int dat, unsigned int ctrl); 670 + void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); 671 + void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len); 672 + void *priv; 658 673 }; 659 674 660 675 /** ··· 660 681 * @ctrl: controller level device structure 661 682 */ 662 683 struct platform_nand_data { 663 - struct platform_nand_chip chip; 664 - struct platform_nand_ctrl ctrl; 684 + struct platform_nand_chip chip; 685 + struct platform_nand_ctrl ctrl; 665 686 }; 666 687 667 688 /* Some helpers to access the data structures */