[MTD] replace remaining __FUNCTION__ occurrences (cb53b3b9) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/mtd/chips/cfi_cmdset_0001.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -384,7 +384,7 @@ read_pri_intelext(struct map_info *map, __u16 adr)
	if (extp_size > 4096) {		if (extp_size > 4096) {
	printk(KERN_ERR		printk(KERN_ERR
	"%s: cfi_pri_intelext is too fat\n",		"%s: cfi_pri_intelext is too fat\n",
	__FUNCTION__);		__func__);
	return NULL;		return NULL;
	}		}
	goto again;		goto again;
	@@ -641,7 +641,7 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,
	if ((1 << partshift) < mtd->erasesize) {		if ((1 << partshift) < mtd->erasesize) {
	printk( KERN_ERR		printk( KERN_ERR
	"%s: bad number of hw partitions (%d)\n",		"%s: bad number of hw partitions (%d)\n",
	__FUNCTION__, numparts);		__func__, numparts);
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -2013,7 +2013,7 @@ static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len)

	#ifdef DEBUG_LOCK_BITS		#ifdef DEBUG_LOCK_BITS
	printk(KERN_DEBUG "%s: lock status before, ofs=0x%08llx, len=0x%08X\n",		printk(KERN_DEBUG "%s: lock status before, ofs=0x%08llx, len=0x%08X\n",
	__FUNCTION__, ofs, len);		__func__, ofs, len);
	cfi_varsize_frob(mtd, do_printlockstatus_oneblock,		cfi_varsize_frob(mtd, do_printlockstatus_oneblock,
	ofs, len, NULL);		ofs, len, NULL);
	#endif		#endif
	@@ -2023,7 +2023,7 @@ static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len)

	#ifdef DEBUG_LOCK_BITS		#ifdef DEBUG_LOCK_BITS
	printk(KERN_DEBUG "%s: lock status after, ret=%d\n",		printk(KERN_DEBUG "%s: lock status after, ret=%d\n",
	__FUNCTION__, ret);		__func__, ret);
	cfi_varsize_frob(mtd, do_printlockstatus_oneblock,		cfi_varsize_frob(mtd, do_printlockstatus_oneblock,
	ofs, len, NULL);		ofs, len, NULL);
	#endif		#endif
	@@ -2037,7 +2037,7 @@ static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)

	#ifdef DEBUG_LOCK_BITS		#ifdef DEBUG_LOCK_BITS
	printk(KERN_DEBUG "%s: lock status before, ofs=0x%08llx, len=0x%08X\n",		printk(KERN_DEBUG "%s: lock status before, ofs=0x%08llx, len=0x%08X\n",
	__FUNCTION__, ofs, len);		__func__, ofs, len);
	cfi_varsize_frob(mtd, do_printlockstatus_oneblock,		cfi_varsize_frob(mtd, do_printlockstatus_oneblock,
	ofs, len, NULL);		ofs, len, NULL);
	#endif		#endif
	@@ -2047,7 +2047,7 @@ static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)

	#ifdef DEBUG_LOCK_BITS		#ifdef DEBUG_LOCK_BITS
	printk(KERN_DEBUG "%s: lock status after, ret=%d\n",		printk(KERN_DEBUG "%s: lock status after, ret=%d\n",
	__FUNCTION__, ret);		__func__, ret);
	cfi_varsize_frob(mtd, do_printlockstatus_oneblock,		cfi_varsize_frob(mtd, do_printlockstatus_oneblock,
	ofs, len, NULL);		ofs, len, NULL);
	#endif		#endif

drivers/mtd/chips/cfi_cmdset_0020.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -445,7 +445,7 @@ static inline int do_write_buffer(struct map_info map, struct flchip chip,
	retry:		retry:

	#ifdef DEBUG_CFI_FEATURES		#ifdef DEBUG_CFI_FEATURES
	printk("%s: chip->state[%d]\n", __FUNCTION__, chip->state);		printk("%s: chip->state[%d]\n", __func__, chip->state);
	#endif		#endif
	spin_lock_bh(chip->mutex);		spin_lock_bh(chip->mutex);

	@@ -463,7 +463,7 @@ static inline int do_write_buffer(struct map_info map, struct flchip chip,
	map_write(map, CMD(0x70), cmd_adr);		map_write(map, CMD(0x70), cmd_adr);
	chip->state = FL_STATUS;		chip->state = FL_STATUS;
	#ifdef DEBUG_CFI_FEATURES		#ifdef DEBUG_CFI_FEATURES
	printk("%s: 1 status[%x]\n", __FUNCTION__, map_read(map, cmd_adr));		printk("%s: 1 status[%x]\n", __func__, map_read(map, cmd_adr));
	#endif		#endif

	case FL_STATUS:		case FL_STATUS:
	@@ -591,7 +591,7 @@ static inline int do_write_buffer(struct map_info map, struct flchip chip,
	/* check for errors: 'lock bit', 'VPP', 'dead cell'/'unerased cell' or 'incorrect cmd' -- saw */		/* check for errors: 'lock bit', 'VPP', 'dead cell'/'unerased cell' or 'incorrect cmd' -- saw */
	if (map_word_bitsset(map, status, CMD(0x3a))) {		if (map_word_bitsset(map, status, CMD(0x3a))) {
	#ifdef DEBUG_CFI_FEATURES		#ifdef DEBUG_CFI_FEATURES
	printk("%s: 2 status[%lx]\n", __FUNCTION__, status.x[0]);		printk("%s: 2 status[%lx]\n", __func__, status.x[0]);
	#endif		#endif
	/* clear status */		/* clear status */
	map_write(map, CMD(0x50), cmd_adr);		map_write(map, CMD(0x50), cmd_adr);
	@@ -625,9 +625,9 @@ static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to,
	ofs = to - (chipnum << cfi->chipshift);		ofs = to - (chipnum << cfi->chipshift);

	#ifdef DEBUG_CFI_FEATURES		#ifdef DEBUG_CFI_FEATURES
	printk("%s: map_bankwidth(map)[%x]\n", __FUNCTION__, map_bankwidth(map));		printk("%s: map_bankwidth(map)[%x]\n", __func__, map_bankwidth(map));
	printk("%s: chipnum[%x] wbufsize[%x]\n", __FUNCTION__, chipnum, wbufsize);		printk("%s: chipnum[%x] wbufsize[%x]\n", __func__, chipnum, wbufsize);
	printk("%s: ofs[%x] len[%x]\n", __FUNCTION__, ofs, len);		printk("%s: ofs[%x] len[%x]\n", __func__, ofs, len);
	#endif		#endif

	/* Write buffer is worth it only if more than one word to write... */		/* Write buffer is worth it only if more than one word to write... */

drivers/mtd/devices/lart.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -275,7 +275,7 @@ static __u8 read8 (__u32 offset)
	{		{
	volatile __u8 data = (__u8 ) (FLASH_OFFSET + offset);		volatile __u8 data = (__u8 ) (FLASH_OFFSET + offset);
	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(): 0x%.8x -> 0x%.2x\n",__FUNCTION__,offset,*data);		printk (KERN_DEBUG "%s(): 0x%.8x -> 0x%.2x\n", __func__, offset, *data);
	#endif		#endif
	return (*data);		return (*data);
	}		}
	@@ -284,7 +284,7 @@ static __u32 read32 (__u32 offset)
	{		{
	volatile __u32 data = (__u32 ) (FLASH_OFFSET + offset);		volatile __u32 data = (__u32 ) (FLASH_OFFSET + offset);
	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(): 0x%.8x -> 0x%.8x\n",__FUNCTION__,offset,*data);		printk (KERN_DEBUG "%s(): 0x%.8x -> 0x%.8x\n", __func__, offset, *data);
	#endif		#endif
	return (*data);		return (*data);
	}		}
	@@ -294,7 +294,7 @@ static void write32 (__u32 x,__u32 offset)
	volatile __u32 data = (__u32 ) (FLASH_OFFSET + offset);		volatile __u32 data = (__u32 ) (FLASH_OFFSET + offset);
	*data = x;		*data = x;
	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(): 0x%.8x <- 0x%.8x\n",__FUNCTION__,offset,*data);		printk (KERN_DEBUG "%s(): 0x%.8x <- 0x%.8x\n", __func__, offset, *data);
	#endif		#endif
	}		}

	@@ -337,7 +337,7 @@ static inline int erase_block (__u32 offset)
	__u32 status;		__u32 status;

	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(): 0x%.8x\n",__FUNCTION__,offset);		printk (KERN_DEBUG "%s(): 0x%.8x\n", __func__, offset);
	#endif		#endif

	/* erase and confirm */		/* erase and confirm */
	@@ -371,7 +371,7 @@ static int flash_erase (struct mtd_info mtd,struct erase_info instr)
	int i,first;		int i,first;

	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(addr = 0x%.8x, len = %d)\n",__FUNCTION__,instr->addr,instr->len);		printk (KERN_DEBUG "%s(addr = 0x%.8x, len = %d)\n", __func__, instr->addr, instr->len);
	#endif		#endif

	/* sanity checks */		/* sanity checks */
	@@ -442,7 +442,7 @@ static int flash_erase (struct mtd_info mtd,struct erase_info instr)
	static int flash_read (struct mtd_info mtd,loff_t from,size_t len,size_t retlen,u_char *buf)		static int flash_read (struct mtd_info mtd,loff_t from,size_t len,size_t retlen,u_char *buf)
	{		{
	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(from = 0x%.8x, len = %d)\n",__FUNCTION__,(__u32) from,len);		printk (KERN_DEBUG "%s(from = 0x%.8x, len = %d)\n", __func__, (__u32)from, len);
	#endif		#endif

	/* sanity checks */		/* sanity checks */
	@@ -488,7 +488,7 @@ static inline int write_dword (__u32 offset,__u32 x)
	__u32 status;		__u32 status;

	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(): 0x%.8x <- 0x%.8x\n",__FUNCTION__,offset,x);		printk (KERN_DEBUG "%s(): 0x%.8x <- 0x%.8x\n", __func__, offset, x);
	#endif		#endif

	/* setup writing */		/* setup writing */
	@@ -524,7 +524,7 @@ static int flash_write (struct mtd_info mtd,loff_t to,size_t len,size_t retlen
	int i,n;		int i,n;

	#ifdef LART_DEBUG		#ifdef LART_DEBUG
	printk (KERN_DEBUG "%s(to = 0x%.8x, len = %d)\n",__FUNCTION__,(__u32) to,len);		printk (KERN_DEBUG "%s(to = 0x%.8x, len = %d)\n", __func__, (__u32)to, len);
	#endif		#endif

	*retlen = 0;		*retlen = 0;

drivers/mtd/devices/m25p80.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ static int wait_till_ready(struct m25p *flash)
	static int erase_sector(struct m25p *flash, u32 offset)		static int erase_sector(struct m25p *flash, u32 offset)
	{		{
	DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB at 0x%08x\n",		DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB at 0x%08x\n",
	flash->spi->dev.bus_id, __FUNCTION__,		flash->spi->dev.bus_id, __func__,
	flash->mtd.erasesize / 1024, offset);		flash->mtd.erasesize / 1024, offset);

	/* Wait until finished previous write command. */		/* Wait until finished previous write command. */
	@@ -188,7 +188,7 @@ static int m25p80_erase(struct mtd_info mtd, struct erase_info instr)
	u32 addr,len;		u32 addr,len;

	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",		DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",
	flash->spi->dev.bus_id, __FUNCTION__, "at",		flash->spi->dev.bus_id, __func__, "at",
	(u32)instr->addr, instr->len);		(u32)instr->addr, instr->len);

	/* sanity checks */		/* sanity checks */
	@@ -240,7 +240,7 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
	struct spi_message m;		struct spi_message m;

	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",		DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
	flash->spi->dev.bus_id, __FUNCTION__, "from",		flash->spi->dev.bus_id, __func__, "from",
	(u32)from, len);		(u32)from, len);

	/* sanity checks */		/* sanity checks */
	@@ -308,7 +308,7 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
	struct spi_message m;		struct spi_message m;

	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",		DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
	flash->spi->dev.bus_id, __FUNCTION__, "to",		flash->spi->dev.bus_id, __func__, "to",
	(u32)to, len);		(u32)to, len);

	if (retlen)		if (retlen)

drivers/mtd/maps/bast-flash.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -137,7 +137,7 @@ static int bast_flash_probe(struct platform_device *pdev)
	if (info->map.size > AREA_MAXSIZE)		if (info->map.size > AREA_MAXSIZE)
	info->map.size = AREA_MAXSIZE;		info->map.size = AREA_MAXSIZE;

	pr_debug("%s: area %08lx, size %ld\n", __FUNCTION__,		pr_debug("%s: area %08lx, size %ld\n", __func__,
	info->map.phys, info->map.size);		info->map.phys, info->map.size);

	info->area = request_mem_region(res->start, info->map.size,		info->area = request_mem_region(res->start, info->map.size,
	@@ -149,7 +149,7 @@ static int bast_flash_probe(struct platform_device *pdev)
	}		}

	info->map.virt = ioremap(res->start, info->map.size);		info->map.virt = ioremap(res->start, info->map.size);
	pr_debug("%s: virt at %08x\n", __FUNCTION__, (int)info->map.virt);		pr_debug("%s: virt at %08x\n", __func__, (int)info->map.virt);

	if (info->map.virt == 0) {		if (info->map.virt == 0) {
	printk(KERN_ERR PFX "failed to ioremap() region\n");		printk(KERN_ERR PFX "failed to ioremap() region\n");