forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777
kernel/drivers/staging/comedi/drivers/mite.c
....@@ -371,7 +371,6 @@
371371 writel(CHOR_CLRDONE,
372372 mite->mmio + MITE_CHOR(mite_chan->channel));
373373 }
374
- mmiowb();
375374 spin_unlock_irqrestore(&mite->lock, flags);
376375 return status;
377376 }
....@@ -451,7 +450,6 @@
451450 mite_chan->done = 0;
452451 /* arm */
453452 writel(CHOR_START, mite->mmio + MITE_CHOR(mite_chan->channel));
454
- mmiowb();
455453 spin_unlock_irqrestore(&mite->lock, flags);
456454 }
457455 EXPORT_SYMBOL_GPL(mite_dma_arm);
....@@ -560,7 +558,14 @@
560558 }
561559 EXPORT_SYMBOL_GPL(mite_prep_dma);
562560
563
-static struct mite_channel *__mite_request_channel(struct mite *mite,
561
+/**
562
+ * mite_request_channel_in_range() - Request a MITE dma channel.
563
+ * @mite: MITE device.
564
+ * @ring: MITE dma ring.
565
+ * @min_channel: minimum channel index to use.
566
+ * @max_channel: maximum channel index to use.
567
+ */
568
+struct mite_channel *mite_request_channel_in_range(struct mite *mite,
564569 struct mite_ring *ring,
565570 unsigned int min_channel,
566571 unsigned int max_channel)
....@@ -585,21 +590,6 @@
585590 spin_unlock_irqrestore(&mite->lock, flags);
586591 return mite_chan;
587592 }
588
-
589
-/**
590
- * mite_request_channel_in_range() - Request a MITE dma channel.
591
- * @mite: MITE device.
592
- * @ring: MITE dma ring.
593
- * @min_channel: minimum channel index to use.
594
- * @max_channel: maximum channel index to use.
595
- */
596
-struct mite_channel *mite_request_channel_in_range(struct mite *mite,
597
- struct mite_ring *ring,
598
- unsigned int min_channel,
599
- unsigned int max_channel)
600
-{
601
- return __mite_request_channel(mite, ring, min_channel, max_channel);
602
-}
603593 EXPORT_SYMBOL_GPL(mite_request_channel_in_range);
604594
605595 /**
....@@ -610,7 +600,8 @@
610600 struct mite_channel *mite_request_channel(struct mite *mite,
611601 struct mite_ring *ring)
612602 {
613
- return __mite_request_channel(mite, ring, 0, mite->num_channels - 1);
603
+ return mite_request_channel_in_range(mite, ring, 0,
604
+ mite->num_channels - 1);
614605 }
615606 EXPORT_SYMBOL_GPL(mite_request_channel);
616607
....@@ -638,7 +629,6 @@
638629 CHCR_CLR_LC_IE | CHCR_CLR_CONT_RB_IE,
639630 mite->mmio + MITE_CHCR(mite_chan->channel));
640631 mite_chan->ring = NULL;
641
- mmiowb();
642632 }
643633 spin_unlock_irqrestore(&mite->lock, flags);
644634 }
....@@ -943,6 +933,6 @@
943933 }
944934 module_exit(mite_module_exit);
945935
946
-MODULE_AUTHOR("Comedi http://www.comedi.org");
936
+MODULE_AUTHOR("Comedi https://www.comedi.org");
947937 MODULE_DESCRIPTION("Comedi helper for NI Mite PCI interface chip");
948938 MODULE_LICENSE("GPL");