@@ -255,7 +255,6 @@ static int qcom_ssc_block_bus_probe(struct platform_device *pdev)
struct qcom_ssc_block_bus_data *data;
struct device_node *np = pdev->dev.of_node;
struct of_phandle_args halt_args;
- struct resource *res;
int ret;
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
@@ -265,14 +264,14 @@ static int qcom_ssc_block_bus_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, data);
/* low level overrides for when the HW logic doesn't "just work" */
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpm_sscaon_config0");
- data->reg_mpm_sscaon_config0 = devm_ioremap_resource(&pdev->dev, res);
+ data->reg_mpm_sscaon_config0 = devm_platform_ioremap_resource_byname(pdev,
+ "mpm_sscaon_config0");
if (IS_ERR(data->reg_mpm_sscaon_config0))
return dev_err_probe(&pdev->dev, PTR_ERR(data->reg_mpm_sscaon_config0),
"Failed to ioremap mpm_sscaon_config0\n");
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpm_sscaon_config1");
- data->reg_mpm_sscaon_config1 = devm_ioremap_resource(&pdev->dev, res);
+ data->reg_mpm_sscaon_config1 = devm_platform_ioremap_resource_byname(pdev,
+ "mpm_sscaon_config1");
if (IS_ERR(data->reg_mpm_sscaon_config1))
return dev_err_probe(&pdev->dev, PTR_ERR(data->reg_mpm_sscaon_config1),
"Failed to ioremap mpm_sscaon_config1\n");