File tree Expand file tree Collapse file tree 1 file changed +10
-12
lines changed Expand file tree Collapse file tree 1 file changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -1859,20 +1859,18 @@ static int advk_pcie_probe(struct platform_device *pdev)
1859
1859
return ret ;
1860
1860
}
1861
1861
1862
- pcie -> reset_gpio = devm_gpiod_get_from_of_node (dev , dev -> of_node ,
1863
- "reset-gpios" , 0 ,
1864
- GPIOD_OUT_LOW ,
1865
- "pcie1-reset" );
1862
+ pcie -> reset_gpio = devm_gpiod_get_optional (dev , "reset" , GPIOD_OUT_LOW );
1866
1863
ret = PTR_ERR_OR_ZERO (pcie -> reset_gpio );
1867
1864
if (ret ) {
1868
- if (ret == - ENOENT ) {
1869
- pcie -> reset_gpio = NULL ;
1870
- } else {
1871
- if (ret != - EPROBE_DEFER )
1872
- dev_err (dev , "Failed to get reset-gpio: %i\n" ,
1873
- ret );
1874
- return ret ;
1875
- }
1865
+ if (ret != - EPROBE_DEFER )
1866
+ dev_err (dev , "Failed to get reset-gpio: %i\n" , ret );
1867
+ return ret ;
1868
+ }
1869
+
1870
+ ret = gpiod_set_consumer_name (pcie -> reset_gpio , "pcie1-reset" );
1871
+ if (ret ) {
1872
+ dev_err (dev , "Failed to set reset gpio name: %d\n" , ret );
1873
+ return ret ;
1876
1874
}
1877
1875
1878
1876
ret = of_pci_get_max_link_speed (dev -> of_node );
You can’t perform that action at this time.
0 commit comments