From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Mar 2024 17:17:10 +0000 (-0700)
Subject: Merge tag 'cocci-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall... 
X-Git-Tag: v6.9-rc1~42
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=ebc9bee8814d12ec247de117aa2f7fd39ff11127;hp=26bbcd630f2f521e60d7ef0a58da188e766553ad;p=sfrench%2Fcifs-2.6.git

Merge tag 'cocci-6.9-rc1' of git://git./linux/kernel/git/jlawall/linux

Pull coccinelle update from Julia Lawall:
 "Simplify the device_attr_show semantic patch

  Also removes an unused variable warning"

* tag 'cocci-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux:
  coccinelle: device_attr_show: Remove useless expression STR
---

diff --git a/scripts/coccinelle/api/device_attr_show.cocci b/scripts/coccinelle/api/device_attr_show.cocci
index 550d1d2fc02a..dfcf9304195f 100644
--- a/scripts/coccinelle/api/device_attr_show.cocci
+++ b/scripts/coccinelle/api/device_attr_show.cocci
@@ -28,7 +28,7 @@ ssize_t show(struct device *dev, struct device_attribute *attr, char *buf)
 
 @rp depends on patch@
 identifier show, dev, attr, buf;
-expression BUF, SZ, FORMAT, STR;
+expression BUF, SZ, FORMAT;
 @@
 
 ssize_t show(struct device *dev, struct device_attribute *attr, char *buf)