Merge tag 'libata-5.10-2020-10-24' of git://git.kernel.dk/linux-block

cb6b2897 · Linus Torvalds <[email protected]> · 2020-10-24 12:36:24 -07:00

Pull libata fixes from Jens Axboe:
 "Two minor libata fixes:

   - Fix a DMA boundary mask regression for sata_rcar (Geert)

   - kerneldoc markup fix (Mauro)"

* tag 'libata-5.10-2020-10-24' of git://git.kernel.dk/linux-block:
  ata: fix some kernel-doc markups
  ata: sata_rcar: Fix DMA boundary mask

Commit: cb6b2897b9b425433ae31dc01f4e1d549f0028c8
Parents: 0eac1102 · 94bd5719

Merge commit. Changes below are compared with the first parent: 0eac1102.

Changes

4 files changed · +4 −4

File	Status	Add	Del	Content
drivers/ata/libata-core.c	modified	+1	−1	View file
drivers/ata/libata-eh.c	modified	+1	−1	View file
drivers/ata/libata-scsi.c	modified	+1	−1	View file
drivers/ata/sata_rcar.c	modified	+1	−1	View file

drivers/ata/libata-core.c

View file

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f546a57..61c7629 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5616,7 +5616,7 @@ int ata_host_start(struct ata_host *host)
 EXPORT_SYMBOL_GPL(ata_host_start);
 
 /**
- *	ata_sas_host_init - Initialize a host struct for sas (ipr, libsas)
+ *	ata_host_init - Initialize a host struct for sas (ipr, libsas)
  *	@host:	host to initialize
  *	@dev:	device host is attached to
  *	@ops:	port_ops

drivers/ata/libata-eh.c

View file

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index d912eaa..b6f9205 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1115,7 +1115,7 @@ void ata_eh_freeze_port(struct ata_port *ap)
 EXPORT_SYMBOL_GPL(ata_eh_freeze_port);
 
 /**
- *	ata_port_thaw_port - EH helper to thaw port
+ *	ata_eh_thaw_port - EH helper to thaw port
  *	@ap: ATA port to thaw
  *
  *	Thaw frozen port @ap.

drivers/ata/libata-scsi.c

View file

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 7043191..48b8934 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1003,7 +1003,7 @@ void ata_scsi_sdev_config(struct scsi_device *sdev)
 }
 
 /**
- *	atapi_drain_needed - Check whether data transfer may overflow
+ *	ata_scsi_dma_need_drain - Check whether data transfer may overflow
  *	@rq: request to be checked
  *
  *	ATAPI commands which transfer variable length data to host

drivers/ata/sata_rcar.c

View file

diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index 141ac60..44b0ed8 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -120,7 +120,7 @@
 /* Descriptor table word 0 bit (when DTA32M = 1) */
 #define SATA_RCAR_DTEND			BIT(0)
 
-#define SATA_RCAR_DMA_BOUNDARY		0x1FFFFFFEUL
+#define SATA_RCAR_DMA_BOUNDARY		0x1FFFFFFFUL
 
 /* Gen2 Physical Layer Control Registers */
 #define RCAR_GEN2_PHY_CTL1_REG		0x1704