| Message ID | 5858980.cRdNx0rNzu@amdc1032 (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Friday, August 30, 2013 12:30:51 PM Bartlomiej Zolnierkiewicz wrote: > The only acpi_processor_get_power_info_fadt() user > (acpi_processor_get_power_info()) dereferences pr before calling > the function. > > The only acpi_processor_hotplug() user (acpi_cpu_soft_notify()) > checks for pr == NULL before calling the function. > > The only acpi_processor_cst_has_changed() user (acpi_processor_notify()) > checks for pr == NULL before calling the function. > > The only acpi_processor_power_init() user (__acpi_processor_start()) > dereferences pr before calling the function. > > Thus remove superfluous pr == NULL checks from affected functions. > > Also: > > While at it remove redundant brackets from acpi_processor_hotplug(). > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Len Brown <lenb@kernel.org> Thanks, I'll queue this up for 3.13. > --- > drivers/acpi/processor_idle.c | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c > index f98dd00..35c8f2b 100644 > --- a/drivers/acpi/processor_idle.c > +++ b/drivers/acpi/processor_idle.c > @@ -272,9 +272,6 @@ static void tsc_check_state(int state) { return; } > static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr) > { > > - if (!pr) > - return -EINVAL; > - > if (!pr->pblk) > return -ENODEV; > > @@ -1076,12 +1073,8 @@ int acpi_processor_hotplug(struct acpi_processor *pr) > if (disabled_by_idle_boot_param()) > return 0; > > - if (!pr) > - return -EINVAL; > - > - if (nocst) { > + if (nocst) > return -ENODEV; > - } > > if (!pr->flags.power_setup_done) > return -ENODEV; > @@ -1108,9 +1101,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) > if (disabled_by_idle_boot_param()) > return 0; > > - if (!pr) > - return -EINVAL; > - > if (nocst) > return -ENODEV; > > @@ -1183,9 +1173,6 @@ int acpi_processor_power_init(struct acpi_processor *pr) > first_run++; > } > > - if (!pr) > - return -EINVAL; > - > if (acpi_gbl_FADT.cst_control && !nocst) { > status = > acpi_os_write_port(acpi_gbl_FADT.smi_command, acpi_gbl_FADT.cst_control, 8); >
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f98dd00..35c8f2b 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -272,9 +272,6 @@ static void tsc_check_state(int state) { return; } static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr) { - if (!pr) - return -EINVAL; - if (!pr->pblk) return -ENODEV; @@ -1076,12 +1073,8 @@ int acpi_processor_hotplug(struct acpi_processor *pr) if (disabled_by_idle_boot_param()) return 0; - if (!pr) - return -EINVAL; - - if (nocst) { + if (nocst) return -ENODEV; - } if (!pr->flags.power_setup_done) return -ENODEV; @@ -1108,9 +1101,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) if (disabled_by_idle_boot_param()) return 0; - if (!pr) - return -EINVAL; - if (nocst) return -ENODEV; @@ -1183,9 +1173,6 @@ int acpi_processor_power_init(struct acpi_processor *pr) first_run++; } - if (!pr) - return -EINVAL; - if (acpi_gbl_FADT.cst_control && !nocst) { status = acpi_os_write_port(acpi_gbl_FADT.smi_command, acpi_gbl_FADT.cst_control, 8);