Skip to content

Commit ed9add2

Browse files
committed
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
2 parents 775a15e + 352bba6 commit ed9add2

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

drivers/reset/reset-rzg2l-usbphy-ctrl.c

+1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev)
176176
vdev->dev.parent = dev;
177177
priv->vdev = vdev;
178178

179+
device_set_of_node_from_dev(&vdev->dev, dev);
179180
error = platform_device_add(vdev);
180181
if (error)
181182
goto err_device_put;

include/linux/pruss_driver.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -144,32 +144,32 @@ static inline int pruss_release_mem_region(struct pruss *pruss,
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 */

0 commit comments

Comments
 (0)