History

Merge tag 'soc-fixes-6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC fixes from Arnd Bergmann: "Two last minute fixes: one build issue on TI soc drivers, and a regression in the renesas reset controller driver" * tag 'soc-fixes-6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: soc: ti: pruss: Fix pruss APIs reset: rzg2l-usbphy-ctrl: Assign proper of node to the allocated device

Linus Torvalds committed 1 year ago

Commit ed9add22 parents 775a15e 352bba62 files · +7 −6Browse files

Showing the changes to include (1 of 2 files). Show all

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 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t