@@ -166,11 +166,12 @@ static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev)
166
166
167
167
static int get_metrics_table (struct amd_pmc_dev * pdev , struct smu_metrics * table )
168
168
{
169
- if (!pdev -> smu_virt_addr ) {
170
- int ret = amd_pmc_setup_smu_logging (pdev );
169
+ int rc ;
171
170
172
- if (ret )
173
- return ret ;
171
+ if (!pdev -> smu_virt_addr ) {
172
+ rc = amd_pmc_setup_smu_logging (pdev );
173
+ if (rc )
174
+ return rc ;
174
175
}
175
176
176
177
if (pdev -> cpu_id == AMD_CPU_ID_PCO )
@@ -219,10 +220,10 @@ static ssize_t smu_fw_version_show(struct device *d, struct device_attribute *at
219
220
char * buf )
220
221
{
221
222
struct amd_pmc_dev * dev = dev_get_drvdata (d );
223
+ int rc ;
222
224
223
225
if (!dev -> major ) {
224
- int rc = amd_pmc_get_smu_version (dev );
225
-
226
+ rc = amd_pmc_get_smu_version (dev );
226
227
if (rc )
227
228
return rc ;
228
229
}
@@ -233,10 +234,10 @@ static ssize_t smu_program_show(struct device *d, struct device_attribute *attr,
233
234
char * buf )
234
235
{
235
236
struct amd_pmc_dev * dev = dev_get_drvdata (d );
237
+ int rc ;
236
238
237
239
if (!dev -> major ) {
238
- int rc = amd_pmc_get_smu_version (dev );
239
-
240
+ rc = amd_pmc_get_smu_version (dev );
240
241
if (rc )
241
242
return rc ;
242
243
}
@@ -697,14 +698,14 @@ static struct acpi_s2idle_dev_ops amd_pmc_s2idle_dev_ops = {
697
698
static int amd_pmc_suspend_handler (struct device * dev )
698
699
{
699
700
struct amd_pmc_dev * pdev = dev_get_drvdata (dev );
701
+ int rc ;
700
702
701
703
/*
702
704
* Must be called only from the same set of dev_pm_ops handlers
703
705
* as i8042_pm_suspend() is called: currently just from .suspend.
704
706
*/
705
707
if (pdev -> disable_8042_wakeup && !disable_workarounds ) {
706
- int rc = amd_pmc_wa_irq1 (pdev );
707
-
708
+ rc = amd_pmc_wa_irq1 (pdev );
708
709
if (rc ) {
709
710
dev_err (pdev -> dev , "failed to adjust keyboard wakeup: %d\n" , rc );
710
711
return rc ;
@@ -743,15 +744,13 @@ static int amd_pmc_probe(struct platform_device *pdev)
743
744
u32 val ;
744
745
745
746
dev -> dev = & pdev -> dev ;
746
-
747
747
rdev = pci_get_domain_bus_and_slot (0 , 0 , PCI_DEVFN (0 , 0 ));
748
748
if (!rdev || !pci_match_id (pmc_pci_ids , rdev )) {
749
749
err = - ENODEV ;
750
750
goto err_pci_dev_put ;
751
751
}
752
752
753
753
dev -> cpu_id = rdev -> device ;
754
-
755
754
if (dev -> cpu_id == AMD_CPU_ID_SP || dev -> cpu_id == AMD_CPU_ID_SHP ) {
756
755
dev_warn_once (dev -> dev , "S0i3 is not supported on this hardware\n" );
757
756
err = - ENODEV ;
@@ -767,7 +766,6 @@ static int amd_pmc_probe(struct platform_device *pdev)
767
766
}
768
767
769
768
base_addr_lo = val & AMD_PMC_BASE_ADDR_HI_MASK ;
770
-
771
769
err = amd_smn_read (0 , AMD_PMC_BASE_ADDR_HI , & val );
772
770
if (err ) {
773
771
dev_err (dev -> dev , "error reading 0x%x\n" , AMD_PMC_BASE_ADDR_HI );
0 commit comments