|
@@ -1944,11 +1944,10 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
|
|
struct device *dev, struct resource *res)
|
|
struct device *dev, struct resource *res)
|
|
{
|
|
{
|
|
struct device_node *node = dev->of_node;
|
|
struct device_node *node = dev->of_node;
|
|
- const struct of_device_id *match;
|
|
|
|
int err = 0;
|
|
int err = 0;
|
|
|
|
|
|
- match = of_match_device(of_match_ptr(omap_sham_of_match), dev);
|
|
|
|
- if (!match) {
|
|
|
|
|
|
+ dd->pdata = of_device_get_match_data(dev);
|
|
|
|
+ if (!dd->pdata) {
|
|
dev_err(dev, "no compatible OF match\n");
|
|
dev_err(dev, "no compatible OF match\n");
|
|
err = -EINVAL;
|
|
err = -EINVAL;
|
|
goto err;
|
|
goto err;
|
|
@@ -1968,8 +1967,6 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
|
|
goto err;
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
|
|
- dd->pdata = match->data;
|
|
|
|
-
|
|
|
|
err:
|
|
err:
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|