|
@@ -240,27 +240,27 @@ static int mxr_acquire_clocks(struct mxr_device *mdev)
|
|
struct device *dev = mdev->dev;
|
|
struct device *dev = mdev->dev;
|
|
|
|
|
|
res->mixer = clk_get(dev, "mixer");
|
|
res->mixer = clk_get(dev, "mixer");
|
|
- if (IS_ERR_OR_NULL(res->mixer)) {
|
|
|
|
|
|
+ if (IS_ERR(res->mixer)) {
|
|
mxr_err(mdev, "failed to get clock 'mixer'\n");
|
|
mxr_err(mdev, "failed to get clock 'mixer'\n");
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
res->vp = clk_get(dev, "vp");
|
|
res->vp = clk_get(dev, "vp");
|
|
- if (IS_ERR_OR_NULL(res->vp)) {
|
|
|
|
|
|
+ if (IS_ERR(res->vp)) {
|
|
mxr_err(mdev, "failed to get clock 'vp'\n");
|
|
mxr_err(mdev, "failed to get clock 'vp'\n");
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
res->sclk_mixer = clk_get(dev, "sclk_mixer");
|
|
res->sclk_mixer = clk_get(dev, "sclk_mixer");
|
|
- if (IS_ERR_OR_NULL(res->sclk_mixer)) {
|
|
|
|
|
|
+ if (IS_ERR(res->sclk_mixer)) {
|
|
mxr_err(mdev, "failed to get clock 'sclk_mixer'\n");
|
|
mxr_err(mdev, "failed to get clock 'sclk_mixer'\n");
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
res->sclk_hdmi = clk_get(dev, "sclk_hdmi");
|
|
res->sclk_hdmi = clk_get(dev, "sclk_hdmi");
|
|
- if (IS_ERR_OR_NULL(res->sclk_hdmi)) {
|
|
|
|
|
|
+ if (IS_ERR(res->sclk_hdmi)) {
|
|
mxr_err(mdev, "failed to get clock 'sclk_hdmi'\n");
|
|
mxr_err(mdev, "failed to get clock 'sclk_hdmi'\n");
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|
|
res->sclk_dac = clk_get(dev, "sclk_dac");
|
|
res->sclk_dac = clk_get(dev, "sclk_dac");
|
|
- if (IS_ERR_OR_NULL(res->sclk_dac)) {
|
|
|
|
|
|
+ if (IS_ERR(res->sclk_dac)) {
|
|
mxr_err(mdev, "failed to get clock 'sclk_dac'\n");
|
|
mxr_err(mdev, "failed to get clock 'sclk_dac'\n");
|
|
goto fail;
|
|
goto fail;
|
|
}
|
|
}
|