[libata] Address some checkpatch-spotted issues (5796d1c4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/ata/pata_pcmcia.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -74,8 +74,7 @@ static int pcmcia_set_mode(struct ata_link link, struct ata_device *r_failed_d
		return ata_do_set_mode(link, r_failed_dev);

		if (memcmp(master->id + ATA_ID_FW_REV, slave->id + ATA_ID_FW_REV,
		ATA_ID_FW_REV_LEN + ATA_ID_PROD_LEN) == 0)
		{
		ATA_ID_FW_REV_LEN + ATA_ID_PROD_LEN) == 0) {
		/* Suspicious match, but could be two cards from
		the same vendor - check serial */
		if (memcmp(master->id + ATA_ID_SERNO, slave->id + ATA_ID_SERNO,
		@@ -248,7 +247,8 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
		goto next_entry;
		io_base = pdev->io.BasePort1;
		ctl_base = pdev->io.BasePort1 + 0x0e;
		} else goto next_entry;
		} else
		goto next_entry;
		/* If we've got this far, we're done */
		break;
		}

drivers/ata/pdc_adma.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -340,8 +340,8 @@ static int adma_fill_sg(struct ata_queued_cmd *qc)
		buf[i++] = 0; /* pPKLW */
		buf[i++] = 0; /* reserved */

		(__le32 )(buf + i)
		= (pFLAGS & pEND) ? 0 : cpu_to_le32(pp->pkt_dma + i + 4);
		(__le32 )(buf + i) =
		(pFLAGS & pEND) ? 0 : cpu_to_le32(pp->pkt_dma + i + 4);
		i += 4;

		VPRINTK("PRD[%u] = (0x%lX, 0x%X)\n", i/4,
		@@ -617,7 +617,7 @@ static int adma_port_start(struct ata_port *ap)
		return -ENOMEM;
		/* paranoia? */
		if ((pp->pkt_dma & 7) != 0) {
		printk("bad alignment for pp->pkt_dma: %08x\n",
		printk(KERN_ERR "bad alignment for pp->pkt_dma: %08x\n",
		(u32)pp->pkt_dma);
		return -ENOMEM;
		}

drivers/ata/sata_mv.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1156,7 +1156,7 @@ static void mv_fill_sg(struct ata_queued_cmd *qc)
		last_sg->flags_size \|= cpu_to_le32(EPRD_FLAG_END_OF_TBL);
		}

		static inline void mv_crqb_pack_cmd(__le16 *cmdw, u8 data, u8 addr, unsigned last)
		static void mv_crqb_pack_cmd(__le16 *cmdw, u8 data, u8 addr, unsigned last)
		{
		u16 tmp = data \| (addr << CRQB_CMD_ADDR_SHIFT) \| CRQB_CMD_CS \|
		(last ? CRQB_CMD_LAST : 0);
		@@ -2510,7 +2510,8 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx)
		break;

		default:
		printk(KERN_ERR DRV_NAME ": BUG: invalid board index %u\n", board_idx);
		dev_printk(KERN_ERR, &pdev->dev,
		"BUG: invalid board index %u\n", board_idx);
		return 1;
		}

drivers/ata/sata_nv.c

+37 −33

Original line number	Diff line number	Diff line
		@@ -884,7 +884,8 @@ static int nv_adma_check_cpb(struct ata_port *ap, int cpb_num, int force_err)
		/* Notifier bits set without a command may indicate the drive
		is misbehaving. Raise host state machine violation on this
		condition. */
		ata_port_printk(ap, KERN_ERR, "notifier for tag %d with no command?\n",
		ata_port_printk(ap, KERN_ERR,
		"notifier for tag %d with no cmd?\n",
		cpb_num);
		ehi->err_mask \|= AC_ERR_HSM;
		ehi->action \|= ATA_EH_SOFTRESET;
		@@ -1342,7 +1343,8 @@ static void nv_adma_fill_sg(struct ata_queued_cmd qc, struct nv_adma_cpb cpb)
		idx = 0;

		ata_for_each_sg(sg, qc) {
		aprd = (idx < 5) ? &cpb->aprd[idx] : &pp->aprd[NV_ADMA_SGTBL_LEN * qc->tag + (idx-5)];
		aprd = (idx < 5) ? &cpb->aprd[idx] :
		&pp->aprd[NV_ADMA_SGTBL_LEN * qc->tag + (idx-5)];
		nv_adma_fill_aprd(qc, sg, idx, aprd);
		idx++;
		}
		@@ -1407,8 +1409,8 @@ static void nv_adma_qc_prep(struct ata_queued_cmd *qc)
		} else
		memset(&cpb->aprd[0], 0, sizeof(struct nv_adma_prd) * 5);

		/* Be paranoid and don't let the device see NV_CPB_CTL_CPB_VALID until we are
		finished filling in all of the contents */
		/* Be paranoid and don't let the device see NV_CPB_CTL_CPB_VALID
		until we are finished filling in all of the contents */
		wmb();
		cpb->ctl_flags = ctl_flags;
		wmb();
		@@ -1436,8 +1438,8 @@ static unsigned int nv_adma_qc_issue(struct ata_queued_cmd *qc)
		wmb();

		if (curr_ncq != pp->last_issue_ncq) {
		/* Seems to need some delay before switching between NCQ and non-NCQ
		commands, else we get command timeouts and such. */
		/* Seems to need some delay before switching between NCQ and
		non-NCQ commands, else we get command timeouts and such. */
		udelay(20);
		pp->last_issue_ncq = curr_ncq;
		}
		@@ -1654,7 +1656,8 @@ static void nv_adma_error_handler(struct ata_port *ap)
		u8 cpb_count = readb(mmio + NV_ADMA_CPB_COUNT);
		u8 next_cpb_idx = readb(mmio + NV_ADMA_NEXT_CPB_IDX);

		ata_port_printk(ap, KERN_ERR, "EH in ADMA mode, notifier 0x%X "
		ata_port_printk(ap, KERN_ERR,
		"EH in ADMA mode, notifier 0x%X "
		"notifier_error 0x%X gen_ctl 0x%X status 0x%X "
		"next cpb count 0x%X next cpb idx 0x%x\n",
		notifier, notifier_error, gen_ctl, status,
		@@ -1673,7 +1676,8 @@ static void nv_adma_error_handler(struct ata_port *ap)
		/* Push us back into port register mode for error handling. */
		nv_adma_register_mode(ap);

		/* Mark all of the CPBs as invalid to prevent them from being executed */
		/* Mark all of the CPBs as invalid to prevent them from
		being executed */
		for (i = 0; i < NV_ADMA_MAX_CPBS; i++)
		pp->cpb[i].ctl_flags &= ~NV_CPB_CTL_CPB_VALID;

		@@ -2352,7 +2356,7 @@ static irqreturn_t nv_swncq_interrupt(int irq, void *dev_instance)

		static int nv_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		{
		static int printed_version = 0;
		static int printed_version;
		const struct ata_port_info *ppi[] = { NULL, NULL };
		struct ata_host *host;
		struct nv_host_priv *hpriv;

drivers/ata/sata_promise.c

+23 −15

Original line number	Diff line number	Diff line
		@@ -83,10 +83,12 @@ enum {
		PDC_PCI_SYS_ERR = (1 << 22), /* PCI system error */
		PDC1_PCI_PARITY_ERR = (1 << 23), /* PCI parity error (from SATA150 driver) */
		PDC1_ERR_MASK = PDC1_PCI_PARITY_ERR,
		PDC2_ERR_MASK = PDC2_HTO_ERR \| PDC2_ATA_HBA_ERR \| PDC2_ATA_DMA_CNT_ERR,
		PDC_ERR_MASK = (PDC_PH_ERR \| PDC_SH_ERR \| PDC_DH_ERR \| PDC_OVERRUN_ERR
		\| PDC_UNDERRUN_ERR \| PDC_DRIVE_ERR \| PDC_PCI_SYS_ERR
		\| PDC1_ERR_MASK \| PDC2_ERR_MASK),
		PDC2_ERR_MASK = PDC2_HTO_ERR \| PDC2_ATA_HBA_ERR \|
		PDC2_ATA_DMA_CNT_ERR,
		PDC_ERR_MASK = PDC_PH_ERR \| PDC_SH_ERR \| PDC_DH_ERR \|
		PDC_OVERRUN_ERR \| PDC_UNDERRUN_ERR \|
		PDC_DRIVE_ERR \| PDC_PCI_SYS_ERR \|
		PDC1_ERR_MASK \| PDC2_ERR_MASK,

		board_2037x = 0, /* FastTrak S150 TX2plus */
		board_2037x_pata = 1, /* FastTrak S150 TX2plus PATA port */
		@@ -695,13 +697,14 @@ static void pdc_irq_clear(struct ata_port *ap)
		readl(mmio + PDC_INT_SEQMASK);
		}

		static inline int pdc_is_sataii_tx4(unsigned long flags)
		static int pdc_is_sataii_tx4(unsigned long flags)
		{
		const unsigned long mask = PDC_FLAG_GEN_II \| PDC_FLAG_4_PORTS;
		return (flags & mask) == mask;
		}

		static inline unsigned int pdc_port_no_to_ata_no(unsigned int port_no, int is_sataii_tx4)
		static unsigned int pdc_port_no_to_ata_no(unsigned int port_no,
		int is_sataii_tx4)
		{
		static const unsigned char sataii_tx4_port_remap[4] = { 3, 1, 0, 2};
		return is_sataii_tx4 ? sataii_tx4_port_remap[port_no] : port_no;
		@@ -844,7 +847,8 @@ static void pdc_tf_load_mmio(struct ata_port ap, const struct ata_taskfile tf)
		ata_tf_load(ap, tf);
		}

		static void pdc_exec_command_mmio(struct ata_port ap, const struct ata_taskfile tf)
		static void pdc_exec_command_mmio(struct ata_port *ap,
		const struct ata_taskfile *tf)
		{
		WARN_ON(tf->protocol == ATA_PROT_DMA \|\|
		tf->protocol == ATA_PROT_ATAPI_DMA);
		@@ -870,8 +874,11 @@ static int pdc_check_atapi_dma(struct ata_queued_cmd *qc)
		}
		/* -45150 (FFFF4FA2) to -1 (FFFFFFFF) shall use PIO mode */
		if (scsicmd[0] == WRITE_10) {
		unsigned int lba;
		lba = (scsicmd[2] << 24) \| (scsicmd[3] << 16) \| (scsicmd[4] << 8) \| scsicmd[5];
		unsigned int lba =
		(scsicmd[2] << 24) \|
		(scsicmd[3] << 16) \|
		(scsicmd[4] << 8) \|
		scsicmd[5];
		if (lba >= 0xFFFF4FA2)
		pio = 1;
		}
		@@ -956,7 +963,8 @@ static void pdc_host_init(struct ata_host *host)
		writel(tmp, mmio + PDC_SLEW_CTL);
		}

		static int pdc_ata_init_one (struct pci_dev pdev, const struct pci_device_id ent)
		static int pdc_ata_init_one(struct pci_dev *pdev,
		const struct pci_device_id *ent)
		{
		static int printed_version;
		const struct ata_port_info *pi = &pdc_port_info[ent->driver_data];