diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-21 21:59:23 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-21 21:59:23 +0300 |
| commit | f248d687e99da6799a25bbf53ca1350b84d41077 (patch) | |
| tree | edb0b90c039e34e838329ca4d96e9888a4ebfa34 /include/linux/surface_aggregator/device.h | |
| parent | 3b2f17ad1770e51b8b4e68b5069c4f1ee477eff8 (diff) | |
| parent | 011ff616ffe8df6b86ee54d14a43c8d1a96a6325 (diff) | |
| download | linux-f248d687e99da6799a25bbf53ca1350b84d41077.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To pick up more UAPI updates to sync with tools/.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/linux/surface_aggregator/device.h')
| -rw-r--r-- | include/linux/surface_aggregator/device.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h index 4441ad667c3f..6ff9c58b3e17 100644 --- a/include/linux/surface_aggregator/device.h +++ b/include/linux/surface_aggregator/device.h @@ -98,9 +98,9 @@ struct ssam_device_uid { | (((fun) != SSAM_ANY_FUN) ? SSAM_MATCH_FUNCTION : 0), \ .domain = d, \ .category = cat, \ - .target = ((tid) != SSAM_ANY_TID) ? (tid) : 0, \ - .instance = ((iid) != SSAM_ANY_IID) ? (iid) : 0, \ - .function = ((fun) != SSAM_ANY_FUN) ? (fun) : 0 \ + .target = __builtin_choose_expr((tid) != SSAM_ANY_TID, (tid), 0), \ + .instance = __builtin_choose_expr((iid) != SSAM_ANY_IID, (iid), 0), \ + .function = __builtin_choose_expr((fun) != SSAM_ANY_FUN, (fun), 0) /** * SSAM_VDEV() - Initialize a &struct ssam_device_id as virtual device with |