Skip to content

Commit 3d46d78

Browse files
committed
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 <[email protected]> Cc: Srinivas Pandruvada <[email protected]> Cc: David E Box <[email protected]> Cc: Gayatri Kammela <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 42d0d42 commit 3d46d78

File tree

1 file changed

+4
-4
lines changed
  • drivers/platform/x86/intel

1 file changed

+4
-4
lines changed

drivers/platform/x86/intel/vsec.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ MODULE_DEVICE_TABLE(pci, intel_vsec_pci_ids);
426426
static pci_ers_result_t intel_vsec_pci_error_detected(struct pci_dev *pdev,
427427
pci_channel_state_t state)
428428
{
429-
pci_channel_state_t status = PCI_ERS_RESULT_NEED_RESET;
429+
pci_ers_result_t status = PCI_ERS_RESULT_NEED_RESET;
430430

431431
dev_info(&pdev->dev, "PCI error detected, state %d", state);
432432

@@ -441,7 +441,7 @@ static pci_ers_result_t intel_vsec_pci_error_detected(struct pci_dev *pdev,
441441
static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
442442
{
443443
struct intel_vsec_device *intel_vsec_dev;
444-
pci_channel_state_t status = PCI_ERS_RESULT_DISCONNECT;
444+
pci_ers_result_t status = PCI_ERS_RESULT_DISCONNECT;
445445
const struct pci_device_id *pci_dev_id;
446446
unsigned long index;
447447

@@ -454,7 +454,7 @@ static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev)
454454
goto out;
455455
}
456456

457-
status = PCI_ERS_RESULT_RECOVERED;
457+
status = PCI_ERS_RESULT_RECOVERED;
458458

459459
xa_for_each(&auxdev_array, index, intel_vsec_dev) {
460460
/* check if pdev doesn't match */
@@ -477,7 +477,7 @@ static void intel_vsec_pci_resume(struct pci_dev *pdev)
477477
dev_info(&pdev->dev, "Done resuming PCI device\n");
478478
}
479479

480-
const struct pci_error_handlers intel_vsec_pci_err_handlers = {
480+
static const struct pci_error_handlers intel_vsec_pci_err_handlers = {
481481
.error_detected = intel_vsec_pci_error_detected,
482482
.slot_reset = intel_vsec_pci_slot_reset,
483483
.resume = intel_vsec_pci_resume,

0 commit comments

Comments
 (0)