74539a3f89
JIRA: https://issues.redhat.com/browse/RHEL-38576 Pull in stable release updates to 4.1.8 * Refined usage of enable-device/disable-device * Update tests to make use of syscall write interface for descriptor submission Resolves: RHEL-38576 Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
From ba7721b36f700ac2c0584c588ead79310ea9f887 Mon Sep 17 00:00:00 2001
|
|
From: Yi Sun <yi.sun@intel.com>
|
|
Date: Tue, 17 Dec 2024 14:39:43 +0800
|
|
Subject: [PATCH] accfg/enable.c: Remove the redundant check.
|
|
'Content-type:text/plain'
|
|
|
|
There's no chance that the device state not mactch with return code.
|
|
|
|
Signed-off-by: Yi Sun <yi.sun@intel.com>
|
|
---
|
|
accfg/enable.c | 16 ++--------------
|
|
1 file changed, 2 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/accfg/enable.c b/accfg/enable.c
|
|
index 18b560a73646..eeab023799ee 100644
|
|
--- a/accfg/enable.c
|
|
+++ b/accfg/enable.c
|
|
@@ -96,7 +96,7 @@ static int device_action(int argc, const char **argv, const char *usage,
|
|
NULL
|
|
};
|
|
int i, rc = -EINVAL, success = 0;
|
|
- enum accfg_device_state state;
|
|
+ enum accfg_device_state;
|
|
struct accfg_device *device = NULL;
|
|
unsigned int bmap_dev = 0;
|
|
|
|
@@ -155,18 +155,6 @@ static int device_action(int argc, const char **argv, const char *usage,
|
|
}
|
|
|
|
rc = dev_action_switch(device, action);
|
|
- if (rc == 0) {
|
|
- /*
|
|
- * Double check if the state of the device
|
|
- * matches with the enable/disable
|
|
- */
|
|
- state = accfg_device_get_state(device);
|
|
- if (((state != ACCFG_DEVICE_ENABLED) &&
|
|
- (action == DEV_ACTION_ENABLE)) ||
|
|
- ((state != ACCFG_DEVICE_DISABLED) &&
|
|
- (action == DEV_ACTION_DISABLE)))
|
|
- rc = ENXIO;
|
|
- }
|
|
if (rc == 0)
|
|
success++;
|
|
else
|
|
@@ -180,7 +168,7 @@ static int device_action(int argc, const char **argv, const char *usage,
|
|
if (success)
|
|
return 0;
|
|
|
|
- return rc;
|
|
+ return -ENXIO;
|
|
}
|
|
|
|
static int action_disable_wq(struct accfg_wq *wq, const char *wq_name)
|
|
--
|
|
2.48.0
|
|
|