Merge tag 'iommu-updates-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / arch / x86 / events / amd / iommu.c

diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index a573fac..1c1a7e4 100644 (file)
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -82,12 +82,12 @@ static struct attribute_group amd_iommu_events_group = {
 };
 
 struct amd_iommu_event_desc {
-       struct kobj_attribute attr;
+       struct device_attribute attr;
        const char *event;
 };
 
-static ssize_t _iommu_event_show(struct kobject *kobj,
-                               struct kobj_attribute *attr, char *buf)
+static ssize_t _iommu_event_show(struct device *dev,
+                               struct device_attribute *attr, char *buf)
 {
        struct amd_iommu_event_desc *event =
                container_of(attr, struct amd_iommu_event_desc, attr);