pci_sriov_resource_alignment() inputs struct pci_dev which it should not need to alter to calculate alignment. Make pci_dev pci_sriov_resource_alignment() inputs const. It requires making pci_iov_resource_size() input const as well.
Showing the changes to include/linux (1 of 8 files). Show all
Unified · Split
| @@ -2540,7 +2540,7 @@ int pci_vfs_assigned(struct pci_dev *dev); · 2539 unmodified lines | |||
| 2540 | int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); | 2540 | int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); |
| 2541 | int pci_sriov_get_totalvfs(struct pci_dev *dev); | 2541 | int pci_sriov_get_totalvfs(struct pci_dev *dev); |
| 2542 | int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn); | 2542 | int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn); |
| 2543 | resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno); | 2543 | resource_size_t pci_iov_resource_size(const struct pci_dev *dev, int resno); |
| 2544 | int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size); | 2544 | int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size); |
| 2545 | u32 pci_iov_vf_bar_get_sizes(struct pci_dev *dev, int resno, int num_vfs); | 2545 | u32 pci_iov_vf_bar_get_sizes(struct pci_dev *dev, int resno, int num_vfs); |
| 2546 | void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe); | 2546 | void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe); |
| @@ -2548,7 +2548,8 @@ void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe); · 1 unmodified line | |||
| 2548 | /* Arch may override these (weak) */ | 2548 | /* Arch may override these (weak) */ |
| 2549 | int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs); | 2549 | int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs); |
| 2550 | int pcibios_sriov_disable(struct pci_dev *pdev); | 2550 | int pcibios_sriov_disable(struct pci_dev *pdev); |
| 2551 | resource_size_t pcibios_iov_resource_alignment(struct pci_dev *dev, int resno); | 2551 | resource_size_t pcibios_iov_resource_alignment(const struct pci_dev *dev, |
| 2552 | int resno); | ||
| 2552 | #else | 2553 | #else |
| 2553 | static inline int pci_iov_virtfn_bus(struct pci_dev *dev, int id) | 2554 | static inline int pci_iov_virtfn_bus(struct pci_dev *dev, int id) |
| 2554 | { | 2555 | { |
| @@ -2593,7 +2594,8 @@ static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs) · 38 unmodified lines | |||
| 2593 | static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) | 2594 | static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) |
| 2594 | { return 0; } | 2595 | { return 0; } |
| 2595 | #define pci_sriov_configure_simple NULL | 2596 | #define pci_sriov_configure_simple NULL |
| 2596 | static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) | 2597 | static inline resource_size_t pci_iov_resource_size(const struct pci_dev *dev, |
| 2598 | int resno) | ||
| 2597 | { return 0; } | 2599 | { return 0; } |
| 2598 | static inline int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size) | 2600 | static inline int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size) |
| 2599 | { return -ENODEV; } | 2601 | { return -ENODEV; } |