2016-03-25 02:13:40

by baiyaowei

[permalink] [raw]
Subject: [PATCH 1/2] drivers/ata: delete unused ata_using_mwdma function

There's no user of ata_using_mwdma since introduced by commit
b15b3ebae ("libata: Fix a large collection of DMA mode mismatches")
in 2008, so remove it.

Signed-off-by: Yaowei Bai <[email protected]>
---
include/linux/libata.h | 7 -------
1 file changed, 7 deletions(-)

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 2c4ebef..2b01760 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1759,13 +1759,6 @@ static inline unsigned long ata_deadline(unsigned long from_jiffies,
change in future hardware and specs, secondly 0xFF means 'no DMA' but is
> UDMA_0. Dyma ddreigiau */

-static inline int ata_using_mwdma(struct ata_device *adev)
-{
- if (adev->dma_mode >= XFER_MW_DMA_0 && adev->dma_mode <= XFER_MW_DMA_4)
- return 1;
- return 0;
-}
-
static inline int ata_using_udma(struct ata_device *adev)
{
if (adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7)
--
1.9.1




2016-03-25 02:13:30

by baiyaowei

[permalink] [raw]
Subject: [PATCH 2/2] drivers/ata: make ata_using_udma return directly and bool

This patch makes ata_using_udma return bool due to this
particular function only using either one or zero as its return
value.

This patch also makes ata_using_udma return directly by removing
if condition.

No functional change.

Signed-off-by: Yaowei Bai <[email protected]>
---
include/linux/libata.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 2b01760..5dc2083 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1759,11 +1759,9 @@ static inline unsigned long ata_deadline(unsigned long from_jiffies,
change in future hardware and specs, secondly 0xFF means 'no DMA' but is
> UDMA_0. Dyma ddreigiau */

-static inline int ata_using_udma(struct ata_device *adev)
+static inline bool ata_using_udma(struct ata_device *adev)
{
- if (adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7)
- return 1;
- return 0;
+ return adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7;
}

static inline int ata_dma_enabled(struct ata_device *adev)
--
1.9.1