Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...

[sfrench/cifs-2.6.git] / drivers / pci / pcie / aspm.c

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 83e4a892b14be796700f3c3a81733470ec425704..af2c0023a1c2405eb5fefbd70109e318af4319f5 100644 (file)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -1061,7 +1061,8 @@ void pci_disable_link_state(struct pci_dev *pdev, int state)
 }
 EXPORT_SYMBOL(pci_disable_link_state);
 
-static int pcie_aspm_set_policy(const char *val, struct kernel_param *kp)
+static int pcie_aspm_set_policy(const char *val,
+                               const struct kernel_param *kp)
 {
        int i;
        struct pcie_link_state *link;
@@ -1088,7 +1089,7 @@ static int pcie_aspm_set_policy(const char *val, struct kernel_param *kp)
        return 0;
 }
 
-static int pcie_aspm_get_policy(char *buffer, struct kernel_param *kp)
+static int pcie_aspm_get_policy(char *buffer, const struct kernel_param *kp)
 {
        int i, cnt = 0;
        for (i = 0; i < ARRAY_SIZE(policy_str); i++)