summaryrefslogtreecommitdiffstats
path: root/drivers/rpmsg/qcom_glink_native.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-14 10:08:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-14 10:08:57 +0200
commit9ef8638bd8c7e06bee087a04af7950cbc6123828 (patch)
treede145994dfe036dbd2d729c61e043f1a96cef25c /drivers/rpmsg/qcom_glink_native.c
parentplatform_device: switch to simpler IDA interface (diff)
parentLinux 5.9-rc5 (diff)
downloadlinux-9ef8638bd8c7e06bee087a04af7950cbc6123828.tar.xz
linux-9ef8638bd8c7e06bee087a04af7950cbc6123828.zip
Merge 5.9-rc5 into driver-core-next
We need the driver core changes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/rpmsg/qcom_glink_native.c')
-rw-r--r--drivers/rpmsg/qcom_glink_native.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
index 1995f5b3ea67..f40312b16da0 100644
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -553,7 +553,7 @@ static void qcom_glink_receive_version(struct qcom_glink *glink,
break;
case GLINK_VERSION_1:
glink->features &= features;
- /* FALLTHROUGH */
+ fallthrough;
default:
qcom_glink_send_version_ack(glink);
break;
@@ -584,7 +584,7 @@ static void qcom_glink_receive_version_ack(struct qcom_glink *glink,
break;
glink->features &= features;
- /* FALLTHROUGH */
+ fallthrough;
default:
qcom_glink_send_version(glink);
break;