From feda47451f4d526c68ded54ae9dfab802422270a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 22 Dec 2014 20:46:49 +0000 Subject: oxnas: sata_oxnas: refactoring phase 1 locking for 2nd port and hwraid was added from vendor's GPL code which doesn't comply with current kernel coding style. - moved all global variables into host_priv - renamed locks - sanetized acquire() and release() parameter list Signed-off-by: Daniel Golle SVN-Revision: 43766 --- target/linux/oxnas/patches-3.14/999-libata-hacks.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'target/linux/oxnas/patches-3.14') diff --git a/target/linux/oxnas/patches-3.14/999-libata-hacks.patch b/target/linux/oxnas/patches-3.14/999-libata-hacks.patch index 39d9e51..a1c80d8 100644 --- a/target/linux/oxnas/patches-3.14/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-3.14/999-libata-hacks.patch @@ -6,9 +6,9 @@ Index: linux-3.18-rc7/drivers/ata/libata-core.c return AC_ERR_SYSTEM; } -+ if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap->port_no, 0, 0)) { ++ if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap, 0, 0)) { + spin_unlock_irqrestore(ap->lock, flags); -+ if (!ap->ops->acquire_hw(ap->port_no, 1, (2*HZ))) { ++ if (!ap->ops->acquire_hw(ap, 1, (2*HZ))) { + return AC_ERR_TIMEOUT; + } + spin_lock_irqsave(ap->lock, flags); @@ -49,11 +49,12 @@ Index: linux-3.18-rc7/include/linux/libata.h /* * Configuration and exception handling -@@ -974,6 +976,8 @@ struct ata_port_operations { +@@ -974,6 +976,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); -+ int (*acquire_hw)(int port_no, int may_sleep, int timeout_jiffies); ++ int (*acquire_hw)(struct ata_port *ap, int may_sleep, ++ int timeout_jiffies); + /* * ->inherits must be the last field and all the preceding -- cgit v1.1