[PATCH] shpchp: miscellaneous cleanups

Remove un-necessary header includes, remove dead code, remove
some type casts, receive function return in the correct data
type...

Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/pci/hotplug/shpchp.h
Simple merge

diff --cc drivers/pci/hotplug/shpchp_core.c
Simple merge

diff --cc drivers/pci/hotplug/shpchp_ctrl.c
Simple merge

diff --cc drivers/pci/hotplug/shpchp_hpc.c
Simple merge

diff --cc drivers/pci/hotplug/shpchp_pci.c
Simple merge

diff --cc drivers/pci/hotplug/shpchp_sysfs.c
Simple merge

diff --cc drivers/pci/hotplug/shpchprm_acpi.c
Simple merge

diff --cc drivers/pci/hotplug/shpchprm_legacy.c
Simple merge

diff --cc drivers/pci/hotplug/shpchprm_nonacpi.c
Simple merge