summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-29 15:07:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-29 15:07:29 -0700
commiteed4897dfe8a9743c998ebb57f86e146864ffa94 (patch)
tree57bffdbe2454b15ee82f1db47f6b5bbe5e27ffa5
parent6f51092301a42105c5cfcb96033e8734aa1bf160 (diff)
parentcd1b772d4881d1cd15b90ec17aab9ac7950e8850 (diff)
downloadlwn-eed4897dfe8a9743c998ebb57f86e146864ffa94.tar.gz
lwn-eed4897dfe8a9743c998ebb57f86e146864ffa94.zip
Merge tag 'driver-core-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH: "Here is a single driver core patch for 5.1-rc3. After 5.1-rc1, all of the users of BUS_ATTR() are finally removed, so we can now drop this macro from include/linux/device.h so that no more new users will be created. This patch has been in linux-next for a while, with no reported issues" * tag 'driver-core-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: driver core: remove BUS_ATTR()
-rw-r--r--include/linux/device.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index b425a7ee04ce..4e6987e11f68 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -49,8 +49,6 @@ struct bus_attribute {
ssize_t (*store)(struct bus_type *bus, const char *buf, size_t count);
};
-#define BUS_ATTR(_name, _mode, _show, _store) \
- struct bus_attribute bus_attr_##_name = __ATTR(_name, _mode, _show, _store)
#define BUS_ATTR_RW(_name) \
struct bus_attribute bus_attr_##_name = __ATTR_RW(_name)
#define BUS_ATTR_RO(_name) \