aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-10-09 16:44:30 +0200
committerDaniel Golle <daniel@makrotopia.org>2020-10-09 16:16:32 +0100
commitf6ca57e4f40528a8a0103c9f0e9647a2e11d10c3 (patch)
treef1e9626d4819334d813e42057116f001ec2fc9c2
parent9604e216bf7b1445e5ddf66ea12446b65d7f2a69 (diff)
downloadupstream-f6ca57e4f40528a8a0103c9f0e9647a2e11d10c3.tar.gz
upstream-f6ca57e4f40528a8a0103c9f0e9647a2e11d10c3.tar.bz2
upstream-f6ca57e4f40528a8a0103c9f0e9647a2e11d10c3.zip
oxnas: fix qc_prep return in sata driver after kernel 5.4.69
This fixes a regression after a kernel change in 5.4.69 [1] that led to build failure on oxnas/ox820: drivers/ata/sata_oxnas.c:2238:13: error: initialization of 'enum ata_completion_errors (*)(struct ata_queued_cmd *)' from incompatible pointer type 'void (*)(struct ata_queued_cmd *)' [-Werror=incompatible-pointer-types] .qc_prep = sata_oxnas_qc_prep, ^~~~~~~~~~~~~~~~~~ drivers/ata/sata_oxnas.c:2238:13: note: (near initialization for 'sata_oxnas_ops.qc_prep') Our local driver is changed the same way as prototyped in the kernel patch, i.e. return type is changed and AC_ERR_OK return value is added. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e11c83520cd04b813cd1748ee2a8f2c620e5f7e3 Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/oxnas/files/drivers/ata/sata_oxnas.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
index 64231a8c70..b55995ccad 100644
--- a/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
+++ b/target/linux/oxnas/files/drivers/ata/sata_oxnas.c
@@ -1802,7 +1802,7 @@ static inline void sata_oxnas_reset_ucode(struct ata_host *ah, int force,
* Prepare as much as possible for a command without involving anything that is
* shared between ports.
*/
-static void sata_oxnas_qc_prep(struct ata_queued_cmd *qc)
+static enum ata_completion_errors sata_oxnas_qc_prep(struct ata_queued_cmd *qc)
{
struct sata_oxnas_port_priv *pd;
int port_no = qc->ap->port_no;
@@ -1848,6 +1848,8 @@ static void sata_oxnas_qc_prep(struct ata_queued_cmd *qc)
/* tell it to wait */
iowrite32(SGDMA_CONTROL_NOGO, pd->sgdma_base + SGDMA_CONTROL);
}
+
+ return AC_ERR_OK;
}
static int sata_oxnas_port_start(struct ata_port *ap)