Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+4 -4
+4 -4
drivers/platform/x86/intel/vsec.c
··· 426 426 static pci_ers_result_t intel_vsec_pci_error_detected(struct pci_dev *pdev, 427 427 pci_channel_state_t state) 428 428 { 429 - pci_channel_state_t status = PCI_ERS_RESULT_NEED_RESET; 429 + pci_ers_result_t status = PCI_ERS_RESULT_NEED_RESET; 430 430 431 431 dev_info(&pdev->dev, "PCI error detected, state %d", state); 432 432 ··· 441 441 static pci_ers_result_t intel_vsec_pci_slot_reset(struct pci_dev *pdev) 442 442 { 443 443 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; 445 445 const struct pci_device_id *pci_dev_id; 446 446 unsigned long index; 447 447 ··· 454 454 goto out; 455 455 } 456 456 457 - status = PCI_ERS_RESULT_RECOVERED; 457 + status = PCI_ERS_RESULT_RECOVERED; 458 458 459 459 xa_for_each(&auxdev_array, index, intel_vsec_dev) { 460 460 /* check if pdev doesn't match */ ··· 477 477 dev_info(&pdev->dev, "Done resuming PCI device\n"); 478 478 } 479 479 480 - const struct pci_error_handlers intel_vsec_pci_err_handlers = { 480 + static const struct pci_error_handlers intel_vsec_pci_err_handlers = { 481 481 .error_detected = intel_vsec_pci_error_detected, 482 482 .slot_reset = intel_vsec_pci_slot_reset, 483 483 .resume = intel_vsec_pci_resume,