Merge tag 'ti-driver-soc-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/fixes

arndb · arndb · commit 352bba6c19cd · 2025-01-15T15:56:24.000+01:00
TI SoC driver updates for v6.14

- Build fixup when CONFIG_TI_PRUSS is disabled.
diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h
@@ -144,32 +144,32 @@ static inline int pruss_release_mem_region(struct pruss *pruss,
 static inline int pruss_cfg_get_gpmux(struct pruss *pruss,
 				      enum pruss_pru_id pru_id, u8 *mux)
 {
-	return ERR_PTR(-EOPNOTSUPP);
+	return -EOPNOTSUPP;
 }
 
 static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
 				      enum pruss_pru_id pru_id, u8 mux)
 {
-	return ERR_PTR(-EOPNOTSUPP);
+	return -EOPNOTSUPP;
 }
 
 static inline int pruss_cfg_gpimode(struct pruss *pruss,
 				    enum pruss_pru_id pru_id,
 				    enum pruss_gpi_mode mode)
 {
-	return ERR_PTR(-EOPNOTSUPP);
+	return -EOPNOTSUPP;
 }
 
 static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)
 {
-	return ERR_PTR(-EOPNOTSUPP);
+	return -EOPNOTSUPP;
 }
 
 static inline int pruss_cfg_xfr_enable(struct pruss *pruss,
 				       enum pru_type pru_type,
-				       bool enable);
+				       bool enable)
 {
-	return ERR_PTR(-EOPNOTSUPP);
+	return -EOPNOTSUPP;
 }
 
 #endif /* CONFIG_TI_PRUSS */

Original file line number	Diff line number	Diff line change
`@@ -144,32 +144,32 @@ static inline int pruss_release_mem_region(struct pruss *pruss,`
`144`	`144`	`static inline int pruss_cfg_get_gpmux(struct pruss *pruss,`
`145`	`145`	`enum pruss_pru_id pru_id, u8 *mux)`
`146`	`146`	`{`
`147`		`- return ERR_PTR(-EOPNOTSUPP);`
	`147`	`+ return -EOPNOTSUPP;`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`static inline int pruss_cfg_set_gpmux(struct pruss *pruss,`
`151`	`151`	`enum pruss_pru_id pru_id, u8 mux)`
`152`	`152`	`{`
`153`		`- return ERR_PTR(-EOPNOTSUPP);`
	`153`	`+ return -EOPNOTSUPP;`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`static inline int pruss_cfg_gpimode(struct pruss *pruss,`
`157`	`157`	`enum pruss_pru_id pru_id,`
`158`	`158`	`enum pruss_gpi_mode mode)`
`159`	`159`	`{`
`160`		`- return ERR_PTR(-EOPNOTSUPP);`
	`160`	`+ return -EOPNOTSUPP;`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)`
`164`	`164`	`{`
`165`		`- return ERR_PTR(-EOPNOTSUPP);`
	`165`	`+ return -EOPNOTSUPP;`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`static inline int pruss_cfg_xfr_enable(struct pruss *pruss,`
`169`	`169`	`enum pru_type pru_type,`
`170`		`- bool enable);`
	`170`	`+ bool enable)`
`171`	`171`	`{`
`172`		`- return ERR_PTR(-EOPNOTSUPP);`
	`172`	`+ return -EOPNOTSUPP;`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`#endif /* CONFIG_TI_PRUSS */`