ide-floppy: cleanup and unify debugging macro calls (bcc77d9c) · Commits · e / devices / android_kernel_teracube_emerald

drivers/ide/ide-floppy.c

+31 −37

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,8 @@
	#define IDEFLOPPY_DEBUG( fmt, args... )		#define IDEFLOPPY_DEBUG( fmt, args... )

	#if IDEFLOPPY_DEBUG_LOG		#if IDEFLOPPY_DEBUG_LOG
	#define debug_log printk		#define debug_log(fmt, args...) \
			printk(KERN_INFO "ide-floppy: " fmt, ## args)
	#else		#else
	#define debug_log(fmt, args... ) do {} while(0)		#define debug_log(fmt, args... ) do {} while(0)
	#endif		#endif
	@@ -478,7 +479,7 @@ static int idefloppy_do_end_request(ide_drive_t *drive, int uptodate, int nsecs)
	struct request *rq = HWGROUP(drive)->rq;		struct request *rq = HWGROUP(drive)->rq;
	int error;		int error;

	debug_log(KERN_INFO "Reached idefloppy_end_request\n");		debug_log("Reached %s\n", __func__);

	switch (uptodate) {		switch (uptodate) {
	case 0: error = IDEFLOPPY_ERROR_GENERAL; break;		case 0: error = IDEFLOPPY_ERROR_GENERAL; break;
	@@ -624,20 +625,19 @@ static void idefloppy_analyze_error (ide_drive_t *drive,idefloppy_request_sense_
	floppy->progress_indication = result->sksv[0] & 0x80 ?		floppy->progress_indication = result->sksv[0] & 0x80 ?
	(u16)get_unaligned((u16 *)(result->sksv+1)):0x10000;		(u16)get_unaligned((u16 *)(result->sksv+1)):0x10000;
	if (floppy->failed_pc)		if (floppy->failed_pc)
	debug_log(KERN_INFO "ide-floppy: pc = %x, sense key = %x, "		debug_log("pc = %x, sense key = %x, asc = %x, ascq = %x\n",
	"asc = %x, ascq = %x\n", floppy->failed_pc->c[0],		floppy->failed_pc->c[0], result->sense_key,
	result->sense_key, result->asc, result->ascq);
	else
	debug_log(KERN_INFO "ide-floppy: sense key = %x, asc = %x, "
	"ascq = %x\n", result->sense_key,
	result->asc, result->ascq);		result->asc, result->ascq);
			else
			debug_log("sense key = %x, asc = %x, ascq = %x\n",
			result->sense_key, result->asc, result->ascq);
	}		}

	static void idefloppy_request_sense_callback (ide_drive_t *drive)		static void idefloppy_request_sense_callback (ide_drive_t *drive)
	{		{
	idefloppy_floppy_t *floppy = drive->driver_data;		idefloppy_floppy_t *floppy = drive->driver_data;

	debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);		debug_log("Reached %s\n", __func__);

	if (!floppy->pc->error) {		if (!floppy->pc->error) {
	idefloppy_analyze_error(drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer);		idefloppy_analyze_error(drive,(idefloppy_request_sense_result_t *) floppy->pc->buffer);
	@@ -655,7 +655,7 @@ static void idefloppy_pc_callback (ide_drive_t *drive)
	{		{
	idefloppy_floppy_t *floppy = drive->driver_data;		idefloppy_floppy_t *floppy = drive->driver_data;

	debug_log(KERN_INFO "ide-floppy: Reached %s\n", __FUNCTION__);		debug_log("Reached %s\n", __func__);

	idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0);		idefloppy_do_end_request(drive, floppy->pc->error ? 0 : 1, 0);
	}		}
	@@ -714,8 +714,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
	u16 bcount;		u16 bcount;
	u8 stat, ireason;		u8 stat, ireason;

	debug_log(KERN_INFO "ide-floppy: Reached %s interrupt handler\n",		debug_log("Reached %s interrupt handler\n", __func__);
	__FUNCTION__);

	if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) {		if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) {
	if (HWIF(drive)->ide_dma_end(drive)) {		if (HWIF(drive)->ide_dma_end(drive)) {
	@@ -724,23 +723,22 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
	pc->actually_transferred = pc->request_transfer;		pc->actually_transferred = pc->request_transfer;
	idefloppy_update_buffers(drive, pc);		idefloppy_update_buffers(drive, pc);
	}		}
	debug_log(KERN_INFO "ide-floppy: DMA finished\n");		debug_log("DMA finished\n");
	}		}

	/* Clear the interrupt */		/* Clear the interrupt */
	stat = drive->hwif->INB(IDE_STATUS_REG);		stat = drive->hwif->INB(IDE_STATUS_REG);

	if ((stat & DRQ_STAT) == 0) { /* No more interrupts */		if ((stat & DRQ_STAT) == 0) { /* No more interrupts */
	debug_log(KERN_INFO "Packet command completed, %d bytes "		debug_log("Packet command completed, %d bytes transferred\n",
	"transferred\n", pc->actually_transferred);		pc->actually_transferred);
	clear_bit(PC_DMA_IN_PROGRESS, &pc->flags);		clear_bit(PC_DMA_IN_PROGRESS, &pc->flags);

	local_irq_enable_in_hardirq();		local_irq_enable_in_hardirq();

	if ((stat & ERR_STAT) \|\| test_bit(PC_DMA_ERROR, &pc->flags)) {		if ((stat & ERR_STAT) \|\| test_bit(PC_DMA_ERROR, &pc->flags)) {
	/* Error detected */		/* Error detected */
	debug_log(KERN_INFO "ide-floppy: %s: I/O error\n",		debug_log("%s: I/O error\n", drive->name);
	drive->name);
	rq->errors++;		rq->errors++;
	if (pc->c[0] == GPCMD_REQUEST_SENSE) {		if (pc->c[0] == GPCMD_REQUEST_SENSE) {
	printk(KERN_ERR "ide-floppy: I/O error in "		printk(KERN_ERR "ide-floppy: I/O error in "
	@@ -801,9 +799,8 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
	NULL);		NULL);
	return ide_started;		return ide_started;
	}		}
	debug_log(KERN_NOTICE "ide-floppy: The floppy wants to "		debug_log("The floppy wants to send us more data than"
	"send us more data than expected - "		" expected - allowing transfer\n");
	"allowing transfer\n");
	}		}
	}		}
	if (test_bit(PC_WRITING, &pc->flags)) {		if (test_bit(PC_WRITING, &pc->flags)) {
	@@ -970,7 +967,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t drive, idefloppy_pc_t p
	return ide_stopped;		return ide_stopped;
	}		}

	debug_log(KERN_INFO "Retry number - %d\n",pc->retries);		debug_log("Retry number - %d\n", pc->retries);

	pc->retries++;		pc->retries++;
	/* We haven't transferred any data yet */		/* We haven't transferred any data yet */
	@@ -1019,7 +1016,7 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t drive, idefloppy_pc_t p

	static void idefloppy_rw_callback (ide_drive_t *drive)		static void idefloppy_rw_callback (ide_drive_t *drive)
	{		{
	debug_log(KERN_INFO "ide-floppy: Reached idefloppy_rw_callback\n");		debug_log("Reached %s\n", __func__);

	idefloppy_do_end_request(drive, 1, 0);		idefloppy_do_end_request(drive, 1, 0);
	return;		return;
	@@ -1027,8 +1024,7 @@ static void idefloppy_rw_callback (ide_drive_t *drive)

	static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent)		static void idefloppy_create_prevent_cmd (idefloppy_pc_t *pc, int prevent)
	{		{
	debug_log(KERN_INFO "ide-floppy: creating prevent removal command, "		debug_log("creating prevent removal command, prevent = %d\n", prevent);
	"prevent = %d\n", prevent);

	idefloppy_init_pc(pc);		idefloppy_init_pc(pc);
	pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;		pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;
	@@ -1164,10 +1160,10 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
	idefloppy_pc_t *pc;		idefloppy_pc_t *pc;
	unsigned long block = (unsigned long)block_s;		unsigned long block = (unsigned long)block_s;

	debug_log(KERN_INFO "dev: %s, flags: %lx, errors: %d\n",		debug_log("dev: %s, cmd_type: %x, errors: %d\n",
	rq->rq_disk ? rq->rq_disk->disk_name : "?",		rq->rq_disk ? rq->rq_disk->disk_name : "?",
	rq->flags, rq->errors);		rq->cmd_type, rq->errors);
	debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, "		debug_log("sector: %ld, nr_sectors: %ld, "
	"current_nr_sectors: %d\n", (long)rq->sector,		"current_nr_sectors: %d\n", (long)rq->sector,
	rq->nr_sectors, rq->current_nr_sectors);		rq->nr_sectors, rq->current_nr_sectors);

	@@ -1376,12 +1372,10 @@ static int idefloppy_get_capacity (ide_drive_t *drive)
	}		}
	}		}
	if (!i) {		if (!i) {
	debug_log( "Descriptor 0 Code: %d\n",		debug_log("Descriptor 0 Code: %d\n", descriptor->dc);
	descriptor->dc);
	}		}
	debug_log( "Descriptor %d: %dkB, %d blocks, %d "		debug_log("Descriptor %d: %dkB, %d blocks, %d sector size\n",
	"sector size\n", i, blocks * length / 1024, blocks,		i, blocks * length / 1024, blocks, length);
	length);
	}		}

	/* Clik! disk does not support get_flexible_disk_page */		/* Clik! disk does not support get_flexible_disk_page */
	@@ -1773,7 +1767,7 @@ static int idefloppy_open(struct inode inode, struct file filp)
	idefloppy_pc_t pc;		idefloppy_pc_t pc;
	int ret = 0;		int ret = 0;

	debug_log(KERN_INFO "Reached idefloppy_open\n");		debug_log("Reached %s\n", __func__);

	if (!(floppy = ide_floppy_get(disk)))		if (!(floppy = ide_floppy_get(disk)))
	return -ENXIO;		return -ENXIO;
	@@ -1834,7 +1828,7 @@ static int idefloppy_release(struct inode inode, struct file filp)
	ide_drive_t *drive = floppy->drive;		ide_drive_t *drive = floppy->drive;
	idefloppy_pc_t pc;		idefloppy_pc_t pc;

	debug_log(KERN_INFO "Reached idefloppy_release\n");		debug_log("Reached %s\n", __func__);

	if (floppy->openers == 1) {		if (floppy->openers == 1) {
	/* IOMEGA Clik! drives do not support lock/unlock commands */		/* IOMEGA Clik! drives do not support lock/unlock commands */