switchdev: reduce transaction phase enum down to a boolean
Now, since we have only 2 values for transaction phase, just use bool.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 9cf372f..1820787 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -17,11 +17,6 @@
#define SWITCHDEV_F_NO_RECURSE BIT(0)
-enum switchdev_trans_ph {
- SWITCHDEV_TRANS_PREPARE,
- SWITCHDEV_TRANS_COMMIT,
-};
-
struct switchdev_trans_item {
struct list_head list;
void *data;
@@ -30,17 +25,17 @@
struct switchdev_trans {
struct list_head item_list;
- enum switchdev_trans_ph ph;
+ bool ph_prepare;
};
static inline bool switchdev_trans_ph_prepare(struct switchdev_trans *trans)
{
- return trans && trans->ph == SWITCHDEV_TRANS_PREPARE;
+ return trans && trans->ph_prepare;
}
static inline bool switchdev_trans_ph_commit(struct switchdev_trans *trans)
{
- return trans && trans->ph == SWITCHDEV_TRANS_COMMIT;
+ return trans && !trans->ph_prepare;
}
enum switchdev_attr_id {
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 1adeeda..00ee547 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -240,7 +240,7 @@
* but should not commit the attr.
*/
- trans.ph = SWITCHDEV_TRANS_PREPARE;
+ trans.ph_prepare = true;
err = __switchdev_port_attr_set(dev, attr, &trans);
if (err) {
/* Prepare phase failed: abort the transaction. Any
@@ -259,7 +259,7 @@
* because the driver said everythings was OK in phase I.
*/
- trans.ph = SWITCHDEV_TRANS_COMMIT;
+ trans.ph_prepare = false;
err = __switchdev_port_attr_set(dev, attr, &trans);
WARN(err, "%s: Commit of attribute (id=%d) failed.\n",
dev->name, attr->id);
@@ -323,7 +323,7 @@
* but should not commit the obj.
*/
- trans.ph = SWITCHDEV_TRANS_PREPARE;
+ trans.ph_prepare = true;
err = __switchdev_port_obj_add(dev, obj, &trans);
if (err) {
/* Prepare phase failed: abort the transaction. Any
@@ -342,7 +342,7 @@
* because the driver said everythings was OK in phase I.
*/
- trans.ph = SWITCHDEV_TRANS_COMMIT;
+ trans.ph_prepare = false;
err = __switchdev_port_obj_add(dev, obj, &trans);
WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, obj->id);
switchdev_trans_items_warn_destroy(dev, &trans);