Merge branch 'for-linville' of git://github.com/kvalo/ath

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / omap-des.c

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index 006d9144485f3483fb2315eb8fcb230b9ac12a28..ec5f13162b733c027d1b2c8d2df2ac2def08c4d8 100644 (file)
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -535,7 +535,7 @@ static int omap_des_crypt_dma_stop(struct omap_des_dev *dd)
        return err;
 }
 
-int omap_des_copy_needed(struct scatterlist *sg)
+static int omap_des_copy_needed(struct scatterlist *sg)
 {
        while (sg) {
                if (!IS_ALIGNED(sg->offset, 4))
@@ -547,7 +547,7 @@ int omap_des_copy_needed(struct scatterlist *sg)
        return 0;
 }
 
-int omap_des_copy_sgs(struct omap_des_dev *dd)
+static int omap_des_copy_sgs(struct omap_des_dev *dd)
 {
        void *buf_in, *buf_out;
        int pages;
@@ -1196,9 +1196,7 @@ static int omap_des_resume(struct device *dev)
 }
 #endif
 
-static const struct dev_pm_ops omap_des_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(omap_des_suspend, omap_des_resume)
-};
+static SIMPLE_DEV_PM_OPS(omap_des_pm_ops, omap_des_suspend, omap_des_resume);
 
 static struct platform_driver omap_des_driver = {
        .probe  = omap_des_probe,