Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d031c226 authored by Wolfram Sang's avatar Wolfram Sang Committed by David Woodhouse
Browse files

mtd: cfi_cmdset_0002: code cleanups 



- remove disabled code (hasn't been touched since the beginning of git
  and should be reimplemented if really needed)
- convert remaining c++-comments to plain c-style

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarGuillaume LECERF <glecerf@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent edb44b9b

drivers/mtd/chips/cfi_cmdset_0002.c

+8 −39
Original line number Diff line number Diff line
@@ -317,14 +317,14 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd, void *param) 


/* Used to fix CFI-Tables of chips without Extended Query Tables */

static struct cfi_fixup cfi_nopri_fixup_table[] = {

	{ CFI_MFR_SST, 0x234A, fixup_sst39vf, NULL, }, // SST39VF1602

	{ CFI_MFR_SST, 0x234B, fixup_sst39vf, NULL, }, // SST39VF1601

	{ CFI_MFR_SST, 0x235A, fixup_sst39vf, NULL, }, // SST39VF3202

	{ CFI_MFR_SST, 0x235B, fixup_sst39vf, NULL, }, // SST39VF3201

	{ CFI_MFR_SST, 0x235C, fixup_sst39vf_rev_b, NULL, }, // SST39VF3202B

	{ CFI_MFR_SST, 0x235D, fixup_sst39vf_rev_b, NULL, }, // SST39VF3201B

	{ CFI_MFR_SST, 0x236C, fixup_sst39vf_rev_b, NULL, }, // SST39VF6402B

	{ CFI_MFR_SST, 0x236D, fixup_sst39vf_rev_b, NULL, }, // SST39VF6401B

	{ CFI_MFR_SST, 0x234A, fixup_sst39vf, NULL, }, /* SST39VF1602 */

	{ CFI_MFR_SST, 0x234B, fixup_sst39vf, NULL, }, /* SST39VF1601 */

	{ CFI_MFR_SST, 0x235A, fixup_sst39vf, NULL, }, /* SST39VF3202 */

	{ CFI_MFR_SST, 0x235B, fixup_sst39vf, NULL, }, /* SST39VF3201 */

	{ CFI_MFR_SST, 0x235C, fixup_sst39vf_rev_b, NULL, }, /* SST39VF3202B */

	{ CFI_MFR_SST, 0x235D, fixup_sst39vf_rev_b, NULL, }, /* SST39VF3201B */

	{ CFI_MFR_SST, 0x236C, fixup_sst39vf_rev_b, NULL, }, /* SST39VF6402B */

	{ CFI_MFR_SST, 0x236D, fixup_sst39vf_rev_b, NULL, }, /* SST39VF6401B */

	{ 0, 0, NULL, NULL }

};
@@ -545,15 +545,6 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd) 
		printk(KERN_WARNING "Sum of regions (%lx) != total size of set of interleaved chips (%lx)\n", offset, devsize);

		goto setup_err;

	}

#if 0

	// debug

	for (i=0; i<mtd->numeraseregions;i++){

		printk("%d: offset=0x%x,size=0x%x,blocks=%d\n",

		       i,mtd->eraseregions[i].offset,

		       mtd->eraseregions[i].erasesize,

		       mtd->eraseregions[i].numblocks);

	}

#endif



	__module_get(THIS_MODULE);

	register_reboot_notifier(&mtd->reboot_notifier);
@@ -1025,9 +1016,6 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi 
	mutex_lock(&chip->mutex);



	if (chip->state != FL_READY){

#if 0

		printk(KERN_DEBUG "Waiting for chip to read, status = %d\n", chip->state);

#endif

		set_current_state(TASK_UNINTERRUPTIBLE);

		add_wait_queue(&chip->wq, &wait);
@@ -1035,10 +1023,6 @@ static inline int do_read_secsi_onechip(struct map_info *map, struct flchip *chi 


		schedule();

		remove_wait_queue(&chip->wq, &wait);

#if 0

		if(signal_pending(current))

			return -EINTR;

#endif

		timeo = jiffies + HZ;



		goto retry;
@@ -1246,9 +1230,6 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, 
		mutex_lock(&cfi->chips[chipnum].mutex);



		if (cfi->chips[chipnum].state != FL_READY) {

#if 0

			printk(KERN_DEBUG "Waiting for chip to write, status = %d\n", cfi->chips[chipnum].state);

#endif

			set_current_state(TASK_UNINTERRUPTIBLE);

			add_wait_queue(&cfi->chips[chipnum].wq, &wait);
@@ -1256,10 +1237,6 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, 


			schedule();

			remove_wait_queue(&cfi->chips[chipnum].wq, &wait);

#if 0

			if(signal_pending(current))

				return -EINTR;

#endif

			goto retry;

		}
@@ -1324,9 +1301,6 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, 
		mutex_lock(&cfi->chips[chipnum].mutex);



		if (cfi->chips[chipnum].state != FL_READY) {

#if 0

			printk(KERN_DEBUG "Waiting for chip to write, status = %d\n", cfi->chips[chipnum].state);

#endif

			set_current_state(TASK_UNINTERRUPTIBLE);

			add_wait_queue(&cfi->chips[chipnum].wq, &wait);
@@ -1334,10 +1308,6 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, 


			schedule();

			remove_wait_queue(&cfi->chips[chipnum].wq, &wait);

#if 0

			if(signal_pending(current))

				return -EINTR;

#endif

			goto retry1;

		}
@@ -1396,7 +1366,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 


	cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);

	cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);

	//cfi_send_gen_cmd(0xA0, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);



	/* Write Buffer Load */

	map_write(map, CMD(0x25), cmd_adr);