| Message ID | 0ff6235a4e2d497e146ce401fa2df71449d290b6.1619188632.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Headers | show |
| Series | [1/2] powerpc: Fix a memory leak in error handling paths | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (d20f726744a0312b4b6613333bda7da9bc52fb75) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 1 warnings, 0 checks, 38 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index e612222f7d2e..155e8586692e 100644 --- a/arch/powerpc/platforms/powermac/feature.c +++ b/arch/powerpc/platforms/powermac/feature.c @@ -83,8 +83,7 @@ struct macio_chip *macio_find(struct device_node *child, int type) } EXPORT_SYMBOL_GPL(macio_find); -static const char *macio_names[] = -{ +static const char *macio_names[] = { "Unknown", "Grand Central", "OHare", @@ -119,8 +118,7 @@ struct feature_table_entry { feature_call function; }; -struct pmac_mb_def -{ +struct pmac_mb_def { const char* model_string; const char* model_name; int model_id; @@ -301,11 +299,10 @@ static long ohare_sleep_state(struct device_node *node, long param, long value) if ((pmac_mb.board_flags & PMAC_MB_CAN_SLEEP) == 0) return -EPERM; - if (value == 1) { + if (value == 1) MACIO_BIC(OHARE_FCR, OH_IOBUS_ENABLE); - } else if (value == 0) { + else if (value == 0) MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE); - } return 0; } @@ -2992,7 +2989,6 @@ void pmac_register_agp_pm(struct pci_dev *bridge, if (bridge != pmac_agp_bridge) return; pmac_agp_suspend = pmac_agp_resume = NULL; - return; } EXPORT_SYMBOL(pmac_register_agp_pm);
'arch/powerpc/platforms/powermac/feature.c' triggers many checkpatch.pl warnings. The code looks old and not very active, so fixing them all does not make so much sense and will hide some 'git blame' information. So only apply a few fixes that save a few lines of code. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- arch/powerpc/platforms/powermac/feature.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)