staging: comedi: gsc_hpdi: tidy up comments (dc05a7d7) · Commits · 戴 / test

drivers/staging/comedi/drivers/gsc_hpdi.c

+34 −25

Original line number	Diff line number	Diff line
		@@ -142,8 +142,10 @@ struct hpdi_private {
		uint32_t dio_buffer[NUM_DMA_BUFFERS]; / dma buffers */
		/* physical addresses of dma buffers */
		dma_addr_t dio_buffer_phys_addr[NUM_DMA_BUFFERS];
		/* array of dma descriptors read by plx9080, allocated to get proper
		* alignment */
		/*
		* array of dma descriptors read by plx9080, allocated to get proper
		* alignment
		*/
		struct plx_dma_desc *dma_desc;
		/* physical address of dma descriptor array */
		dma_addr_t dma_desc_phys_addr;
		@@ -226,7 +228,8 @@ static irqreturn_t gsc_hpdi_interrupt(int irq, void *d)
		/* spin lock makes sure no one else changes plx dma control reg */
		spin_lock_irqsave(&dev->spinlock, flags);
		dma0_status = readb(devpriv->plx9080_mmio + PLX_DMA0_CS_REG);
		if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */
		if (plx_status & ICS_DMA0_A) {
		/* dma chan 0 interrupt */
		writeb((dma0_status & PLX_DMA_EN_BIT) \| PLX_CLEAR_DMA_INTR_BIT,
		devpriv->plx9080_mmio + PLX_DMA0_CS_REG);

		@@ -238,14 +241,16 @@ static irqreturn_t gsc_hpdi_interrupt(int irq, void *d)
		/* spin lock makes sure no one else changes plx dma control reg */
		spin_lock_irqsave(&dev->spinlock, flags);
		dma1_status = readb(devpriv->plx9080_mmio + PLX_DMA1_CS_REG);
		if (plx_status & ICS_DMA1_A) { /* XXX // dma chan 1 interrupt */
		if (plx_status & ICS_DMA1_A) {
		/* XXX / / dma chan 1 interrupt */
		writeb((dma1_status & PLX_DMA_EN_BIT) \| PLX_CLEAR_DMA_INTR_BIT,
		devpriv->plx9080_mmio + PLX_DMA1_CS_REG);
		}
		spin_unlock_irqrestore(&dev->spinlock, flags);

		/* clear possible plx9080 interrupt sources */
		if (plx_status & ICS_LDIA) { /* clear local doorbell interrupt */
		if (plx_status & ICS_LDIA) {
		/* clear local doorbell interrupt */
		plx_bits = readl(devpriv->plx9080_mmio + PLX_DBR_OUT_REG);
		writel(plx_bits, devpriv->plx9080_mmio + PLX_DBR_OUT_REG);
		}
		@@ -576,11 +581,15 @@ static void gsc_hpdi_init_plx9080(struct comedi_device *dev)
		bits \|= PLX_DMA_EN_READYIN_BIT;
		/* enable dma chaining */
		bits \|= PLX_EN_CHAIN_BIT;
		/* enable interrupt on dma done
		* (probably don't need this, since chain never finishes) */
		/*
		* enable interrupt on dma done
		* (probably don't need this, since chain never finishes)
		*/
		bits \|= PLX_EN_DMA_DONE_INTR_BIT;
		/* don't increment local address during transfers
		* (we are transferring from a fixed fifo register) */
		/*
		* don't increment local address during transfers
		* (we are transferring from a fixed fifo register)
		*/
		bits \|= PLX_LOCAL_ADDR_CONST_BIT;
		/* route dma interrupt to pci bus */
		bits \|= PLX_DMA_INTR_PCI_BIT;

Admin message