History

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

TI SoC driver updates for v6.14 - Build fixup when CONFIG_TI_PRUSS is disabled.

Arnd Bergmann committed 1 year ago

Commit 352bba62 parents bc6a958 202580b1 file · +6 −6Browse files

Unified · Split

include/linux/pruss_driver.h+6−6
@@ -144,32 +144,32 @@ static inline int pruss_release_mem_region(struct pruss *pruss, · 143 unmodified lines
144144 static inline int pruss_cfg_get_gpmux(struct pruss *pruss,
145145 enum pruss_pru_id pru_id, u8 *mux)
146146 {
147− return ERR_PTR(-EOPNOTSUPP);
147+ return -EOPNOTSUPP;
148148 }
149149
150150 static inline int pruss_cfg_set_gpmux(struct pruss *pruss,
151151 enum pruss_pru_id pru_id, u8 mux)
152152 {
153− return ERR_PTR(-EOPNOTSUPP);
153+ return -EOPNOTSUPP;
154154 }
155155
156156 static inline int pruss_cfg_gpimode(struct pruss *pruss,
157157 enum pruss_pru_id pru_id,
158158 enum pruss_gpi_mode mode)
159159 {
160− return ERR_PTR(-EOPNOTSUPP);
160+ return -EOPNOTSUPP;
161161 }
162162
163163 static inline int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)
164164 {
165− return ERR_PTR(-EOPNOTSUPP);
165+ return -EOPNOTSUPP;
166166 }
167167
168168 static inline int pruss_cfg_xfr_enable(struct pruss *pruss,
169169 enum pru_type pru_type,
170− bool enable);
170+ bool enable)
171171 {
172− return ERR_PTR(-EOPNOTSUPP);
172+ return -EOPNOTSUPP;
173173 }
174174
175175 #endif /* CONFIG_TI_PRUSS */