diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 17:59:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 17:59:52 -0700 |
| commit | b2665fe61d8a51ef70b27e1a830635a72dcc6ad8 (patch) | |
| tree | 66d43a662450e5505f88844bc10b845daa742ca7 /drivers/ata/libata.h | |
| parent | b47c18232a85ae064ad923de402f0a21d46155e2 (diff) | |
| parent | d4a89339f17c87c4990070e9116462d16e75894f (diff) | |
| download | linux-b2665fe61d8a51ef70b27e1a830635a72dcc6ad8.tar.gz linux-b2665fe61d8a51ef70b27e1a830635a72dcc6ad8.tar.bz2 linux-b2665fe61d8a51ef70b27e1a830635a72dcc6ad8.zip | |
Merge tag 'ata-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Pull ata updates from Damien Le Moal:
- Convert the bindings for the imx-pata and ahci-da850 drivers to DT
schemas (from Animesh)
- Correct the code to handle HAS_IOPORT dependencies and conditionally
compile drivers as needed (from Niklas)
- Correct the legacy_exit() function in the pata_legacy driver to
properly handle cleanups on driver exit (from Sergey)
- Small code simplification removing the ata_exec_internal_sg()
function and folding it into its only caller (from me)
* tag 'ata-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
ata: pata_legacy: make legacy_exit() work again
ata: libata-core: Remove ata_exec_internal_sg()
ata: add HAS_IOPORT dependencies
dt-bindings: ata: ahci-da850: Convert to dtschema
dt-bindings: ata: imx-pata: Convert to dtschema
Diffstat (limited to 'drivers/ata/libata.h')
| -rw-r--r-- | drivers/ata/libata.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 5c685bb1939e..1a9881dc2aa1 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -50,10 +50,10 @@ extern int ata_build_rw_tf(struct ata_queued_cmd *qc, u64 block, u32 n_block, unsigned int tf_flags, int dld, int class); extern u64 ata_tf_read_block(const struct ata_taskfile *tf, struct ata_device *dev); -extern unsigned ata_exec_internal(struct ata_device *dev, - struct ata_taskfile *tf, const u8 *cdb, - int dma_dir, void *buf, unsigned int buflen, - unsigned int timeout); +unsigned int ata_exec_internal(struct ata_device *dev, struct ata_taskfile *tf, + const u8 *cdb, enum dma_data_direction dma_dir, + void *buf, unsigned int buflen, + unsigned int timeout); extern int ata_wait_ready(struct ata_link *link, unsigned long deadline, int (*check_ready)(struct ata_link *link)); extern int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class, |