mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
platform/x86/intel/vsec: Fix wrong type for local status variables
The local status variables in intel_vsec_pci_error_detected() and intel_vsec_pci_slot_reset() should have pci_ers_result_t as type (and not pci_channel_state_t). Also fix a whitespace error as well as intel_vsec_pci_err_handlers not being marked static. This fixes the following sparse errors: drivers/platform/x86/intel/vsec.c:429:38: sparse: sparse: incorrect type in initializer (different base types) @@ expected restricted pci_channel_state_t [usertype] status @@ got restricted pci_ers_result_t @@ drivers/platform/x86/intel/vsec.c:429:38: sparse: expected restricted pci_channel_state_t [usertype] status drivers/platform/x86/intel/vsec.c:429:38: sparse: got restricted pci_ers_result_t drivers/platform/x86/intel/vsec.c:434:24: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted pci_channel_state_t [usertype] status @@ got restricted pci_ers_result_t @@ drivers/platform/x86/intel/vsec.c:434:24: sparse: expected restricted pci_channel_state_t [usertype] status drivers/platform/x86/intel/vsec.c:434:24: sparse: got restricted pci_ers_result_t drivers/platform/x86/intel/vsec.c:438:16: sparse: sparse: incorrect type in return expression (different base types) @@ expected restricted pci_ers_result_t @@ got restricted pci_channel_state_t [usertype] status @@ drivers/platform/x86/intel/vsec.c:438:16: sparse: expected restricted pci_ers_result_t drivers/platform/x86/intel/vsec.c:438:16: sparse: got restricted pci_channel_state_t [usertype] status drivers/platform/x86/intel/vsec.c:444:38: sparse: sparse: incorrect type in initializer (different base types) @@ expected restricted pci_channel_state_t [usertype] status @@ got restricted pci_ers_result_t @@ drivers/platform/x86/intel/vsec.c:444:38: sparse: expected restricted pci_channel_state_t [usertype] status drivers/platform/x86/intel/vsec.c:444:38: sparse: got restricted pci_ers_result_t drivers/platform/x86/intel/vsec.c:457:16: sparse: sparse: incorrect type in assignment (different base types) @@ expected restricted pci_channel_state_t [usertype] status @@ got restricted pci_ers_result_t @@ drivers/platform/x86/intel/vsec.c:457:16: sparse: expected restricted pci_channel_state_t [usertype] status drivers/platform/x86/intel/vsec.c:457:16: sparse: got restricted pci_ers_result_t drivers/platform/x86/intel/vsec.c:472:16: sparse: sparse: incorrect type in return expression (different base types) @@ expected restricted pci_ers_result_t @@ got restricted pci_channel_state_t [usertype] status @@ drivers/platform/x86/intel/vsec.c:472:16: sparse: expected restricted pci_ers_result_t drivers/platform/x86/intel/vsec.c:472:16: sparse: got restricted pci_channel_state_t [usertype] status drivers/platform/x86/intel/vsec.c:480:33: sparse: sparse: symbol 'intel_vsec_pci_err_handlers' was not declared. Should it be static? Reported-by: kernel test robot <lkp@intel.com> Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com> Cc: David E Box <david.e.box@intel.com> Cc: Gayatri Kammela <gayatri.kammela@linux.intel.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20220801145536.172410-1-hdegoede@redhat.com
This commit is contained in:
parent
42d0d4232a
commit
3d46d78480
1 changed files with 4 additions and 4 deletions
|
@ -426,7 +426,7 @@ MODULE_DEVICE_TABLE(pci, intel_vsec_pci_ids);
|
||||||
static pci_ers_result_t intel_vsec_pci_error_detected(struct pci_dev *pdev,
|
static pci_ers_result_t intel_vsec_pci_error_detected(struct pci_dev *pdev,
|
||||||
pci_channel_state_t state)
|
pci_channel_state_t state)
|
||||||
{
|
{
|
||||||
pci_channel_state_t status = PCI_ERS_RESULT_NEED_RESET;
|
pci_ers_result_t status = PCI_ERS_RESULT_NEED_RESET;
|
||||||
|
|
||||||
dev_info(&pdev->dev, "PCI error detected, state %d", state);
|
dev_info(&pdev->dev, "PCI error detected, state %d", state);
|
||||||
|
|
||||||
|
@ -441,7 +441,7 @@ static pci_ers_result_t intel_vsec_pci_error_detected(struct pci_dev *pdev,
|
||||||
static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
|
static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
|
||||||
{
|
{
|
||||||
struct intel_vsec_device *intel_vsec_dev;
|
struct intel_vsec_device *intel_vsec_dev;
|
||||||
pci_channel_state_t status = PCI_ERS_RESULT_DISCONNECT;
|
pci_ers_result_t status = PCI_ERS_RESULT_DISCONNECT;
|
||||||
const struct pci_device_id *pci_dev_id;
|
const struct pci_device_id *pci_dev_id;
|
||||||
unsigned long index;
|
unsigned long index;
|
||||||
|
|
||||||
|
@ -454,7 +454,7 @@ static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
status = PCI_ERS_RESULT_RECOVERED;
|
status = PCI_ERS_RESULT_RECOVERED;
|
||||||
|
|
||||||
xa_for_each(&auxdev_array, index, intel_vsec_dev) {
|
xa_for_each(&auxdev_array, index, intel_vsec_dev) {
|
||||||
/* check if pdev doesn't match */
|
/* check if pdev doesn't match */
|
||||||
|
@ -477,7 +477,7 @@ static void intel_vsec_pci_resume(struct pci_dev *pdev)
|
||||||
dev_info(&pdev->dev, "Done resuming PCI device\n");
|
dev_info(&pdev->dev, "Done resuming PCI device\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct pci_error_handlers intel_vsec_pci_err_handlers = {
|
static const struct pci_error_handlers intel_vsec_pci_err_handlers = {
|
||||||
.error_detected = intel_vsec_pci_error_detected,
|
.error_detected = intel_vsec_pci_error_detected,
|
||||||
.slot_reset = intel_vsec_pci_slot_reset,
|
.slot_reset = intel_vsec_pci_slot_reset,
|
||||||
.resume = intel_vsec_pci_resume,
|
.resume = intel_vsec_pci_resume,
|
||||||
|
|
Loading…
Reference in a new issue