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

Commit 159127ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE updates from David Miller:

 - Remove redundant variables (Colin Ian King)

 - Expected switch fall-through annotations (Gustavo A. R. Silva)

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: mark expected switch fall-throughs
  ide-tape: remove redundant variable buffer_size
  ide: remove redundant variables queue_run_ms and left
parents 9617ba39 a2eed33d

drivers/ide/hpt366.c

+3 −2
Original line number Diff line number Diff line
@@ -574,13 +574,14 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive) 
		if (!HPT370_ALLOW_ATA100_5 ||

		    check_in_drive_list(drive, bad_ata100_5))

			return ATA_UDMA4;

		/* else: fall through */

	case HPT372 :

	case HPT372A:

	case HPT372N:

	case HPT374 :

		if (ata_id_is_sata(drive->id))

			mask &= ~0x0e;

		/* Fall thru */

		/* fall through */

	default:

		return mask;

	}
@@ -600,7 +601,7 @@ static u8 hpt3xx_mdma_filter(ide_drive_t *drive) 
	case HPT374 :

		if (ata_id_is_sata(drive->id))

			return 0x00;

		/* Fall thru */

		/* else: fall through */

	default:

		return 0x07;

	}

drivers/ide/ide-floppy.c

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) 
				 * (maintains previous driver behaviour)

				 */

				break;

			/* else: fall through */

		case CAPACITY_CURRENT:

			/* Normal Zip/LS-120 disks */

			if (memcmp(cap_desc, &floppy->cap_desc, 8))

drivers/ide/ide-io.c

+0 −4
Original line number Diff line number Diff line
@@ -460,7 +460,6 @@ void do_ide_request(struct request_queue *q) 
	struct ide_host *host = hwif->host;

	struct request	*rq = NULL;

	ide_startstop_t	startstop;

	unsigned long queue_run_ms = 3; /* old plug delay */



	spin_unlock_irq(q->queue_lock);
@@ -480,9 +479,6 @@ void do_ide_request(struct request_queue *q) 
		prev_port = hwif->host->cur_port;

		if (drive->dev_flags & IDE_DFLAG_SLEEPING &&

		    time_after(drive->sleep, jiffies)) {

			unsigned long left = jiffies - drive->sleep;



			queue_run_ms = jiffies_to_msecs(left + 1);

			ide_unlock_port(hwif);

			goto plug_device;

		}

drivers/ide/ide-probe.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static void ide_classify_atapi_dev(ide_drive_t *drive) 
		}

		/* Early cdrom models used zero */

		type = ide_cdrom;

		/* fall through */

	case ide_cdrom:

		drive->dev_flags |= IDE_DFLAG_REMOVABLE;

#ifdef CONFIG_PPC

drivers/ide/ide-tape.c

+0 −2
Original line number Diff line number Diff line
@@ -1746,7 +1746,6 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor) 
{

	unsigned long t;

	int speed;

	int buffer_size;

	u16 *ctl = (u16 *)&tape->caps[12];



	ide_debug_log(IDE_DBG_FUNC, "minor: %d", minor);
@@ -1781,7 +1780,6 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor) 
		*ctl /= 2;

		tape->buffer_size = *ctl * tape->blk_size;

	}

	buffer_size = tape->buffer_size;



	/* select the "best" DSC read/write polling freq */

	speed = max(*(u16 *)&tape->caps[14], *(u16 *)&tape->caps[8]);