thunderbolt: merge fix for kunix_resource changes

sfrothwell · torvalds · commit 71fa1a4489ff · 2020-08-09T11:06:10.000-07:00
Signed-off-by: Stephen Rothwell &lt;sfr@canb.auug.org.au&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/thunderbolt/test.c b/drivers/thunderbolt/test.c
@@ -17,13 +17,13 @@ static int __ida_init(struct kunit_resource *res, void *context)
 	struct ida *ida = context;
 
 	ida_init(ida);
-	res->allocation = ida;
+	res->data = ida;
 	return 0;
 }
 
 static void __ida_destroy(struct kunit_resource *res)
 {
-	struct ida *ida = res->allocation;
+	struct ida *ida = res->data;
 
 	ida_destroy(ida);
 }

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ static int __ida_init(struct kunit_resource res, void context)`
`17`	`17`	`struct ida *ida = context;`
`18`	`18`
`19`	`19`	`ida_init(ida);`
`20`		`- res->allocation = ida;`
	`20`	`+ res->data = ida;`
`21`	`21`	`return 0;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`static void __ida_destroy(struct kunit_resource *res)`
`25`	`25`	`{`
`26`		`- struct ida *ida = res->allocation;`
	`26`	`+ struct ida *ida = res->data;`
`27`	`27`
`28`	`28`	`ida_destroy(ida);`
`29`	`29`	`}`