diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 16:10:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 16:10:09 -0800 |
commit | e6b5be2be4e30037eb551e0ed09dd97bd00d85d3 (patch) | |
tree | 88801365987a0dc64d62d47e8a11f3b44691c37f /drivers/crypto | |
parent | 37da7bbbe84fe9e8862940d3f9194fd27dce59bb (diff) | |
parent | f1c488a78d9f1a22cdb15648c15e70fd82ed229a (diff) |
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core update from Greg KH:
"Here's the set of driver core patches for 3.19-rc1.
They are dominated by the removal of the .owner field in platform
drivers. They touch a lot of files, but they are "simple" changes,
just removing a line in a structure.
Other than that, a few minor driver core and debugfs changes. There
are some ath9k patches coming in through this tree that have been
acked by the wireless maintainers as they relied on the debugfs
changes.
Everything has been in linux-next for a while"
* tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits)
Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries"
fs: debugfs: add forward declaration for struct device type
firmware class: Deletion of an unnecessary check before the function call "vunmap"
firmware loader: fix hung task warning dump
devcoredump: provide a one-way disable function
device: Add dev_<level>_once variants
ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries
ath: use seq_file api for ath9k debugfs files
debugfs: add helper function to create device related seq_file
drivers/base: cacheinfo: remove noisy error boot message
Revert "core: platform: add warning if driver has no owner"
drivers: base: support cpu cache information interface to userspace via sysfs
drivers: base: add cpu_device_create to support per-cpu devices
topology: replace custom attribute macros with standard DEVICE_ATTR*
cpumask: factor out show_cpumap into separate helper function
driver core: Fix unbalanced device reference in drivers_probe
driver core: fix race with userland in device_add()
sysfs/kernfs: make read requests on pre-alloc files use the buffer.
sysfs/kernfs: allow attributes to request write buffer be pre-allocated.
fs: sysfs: return EGBIG on write if offset is larger than file size
...
Diffstat (limited to 'drivers/crypto')
-rw-r--r-- | drivers/crypto/amcc/crypto4xx_core.c | 1 | ||||
-rw-r--r-- | drivers/crypto/atmel-aes.c | 1 | ||||
-rw-r--r-- | drivers/crypto/atmel-sha.c | 1 | ||||
-rw-r--r-- | drivers/crypto/atmel-tdes.c | 1 | ||||
-rw-r--r-- | drivers/crypto/bfin_crc.c | 1 | ||||
-rw-r--r-- | drivers/crypto/caam/ctrl.c | 1 | ||||
-rw-r--r-- | drivers/crypto/caam/jr.c | 1 | ||||
-rw-r--r-- | drivers/crypto/ccp/ccp-platform.c | 1 | ||||
-rw-r--r-- | drivers/crypto/mv_cesa.c | 1 | ||||
-rw-r--r-- | drivers/crypto/mxs-dcp.c | 1 | ||||
-rw-r--r-- | drivers/crypto/n2_core.c | 2 | ||||
-rw-r--r-- | drivers/crypto/omap-aes.c | 1 | ||||
-rw-r--r-- | drivers/crypto/omap-des.c | 1 | ||||
-rw-r--r-- | drivers/crypto/omap-sham.c | 1 | ||||
-rw-r--r-- | drivers/crypto/qce/core.c | 1 | ||||
-rw-r--r-- | drivers/crypto/s5p-sss.c | 1 | ||||
-rw-r--r-- | drivers/crypto/sahara.c | 1 | ||||
-rw-r--r-- | drivers/crypto/talitos.c | 1 | ||||
-rw-r--r-- | drivers/crypto/ux500/cryp/cryp_core.c | 1 | ||||
-rw-r--r-- | drivers/crypto/ux500/hash/hash_core.c | 1 |
20 files changed, 0 insertions, 21 deletions
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c index e4c6c58fbb0..d02b7715007 100644 --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c @@ -1288,7 +1288,6 @@ static const struct of_device_id crypto4xx_match[] = { static struct platform_driver crypto4xx_driver = { .driver = { .name = "crypto4xx", - .owner = THIS_MODULE, .of_match_table = crypto4xx_match, }, .probe = crypto4xx_probe, diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c index a083474991a..53d1c330f8a 100644 --- a/drivers/crypto/atmel-aes.c +++ b/drivers/crypto/atmel-aes.c @@ -1473,7 +1473,6 @@ static struct platform_driver atmel_aes_driver = { .remove = atmel_aes_remove, .driver = { .name = "atmel_aes", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(atmel_aes_dt_ids), }, }; diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index 9a4f69eaa5e..d94f07c78e1 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -1529,7 +1529,6 @@ static struct platform_driver atmel_sha_driver = { .remove = atmel_sha_remove, .driver = { .name = "atmel_sha", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(atmel_sha_dt_ids), }, }; diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c index d3a9041938e..5e7c896cde3 100644 --- a/drivers/crypto/atmel-tdes.c +++ b/drivers/crypto/atmel-tdes.c @@ -1524,7 +1524,6 @@ static struct platform_driver atmel_tdes_driver = { .remove = atmel_tdes_remove, .driver = { .name = "atmel_tdes", - .owner = THIS_MODULE, .of_match_table = of_match_ptr(atmel_tdes_dt_ids), }, }; diff --git a/drivers/crypto/bfin_crc.c b/drivers/crypto/bfin_crc.c index e96eddc0e0b..9ae149bddb6 100644 --- a/drivers/crypto/bfin_crc.c +++ b/drivers/crypto/bfin_crc.c @@ -724,7 +724,6 @@ static struct platform_driver bfin_crypto_crc_driver = { .resume = bfin_crypto_crc_resume, .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, }, }; diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 31000c8c4a9..70f1e6f3733 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -720,7 +720,6 @@ MODULE_DEVICE_TABLE(of, caam_match); static struct platform_driver caam_driver = { .driver = { .name = "caam", - .owner = THIS_MODULE, .of_match_table = caam_match, }, .probe = caam_probe, diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index 9207c907a12..9b3ef1bc9bd 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -511,7 +511,6 @@ MODULE_DEVICE_TABLE(of, caam_jr_match); static struct platform_driver caam_jr_driver = { .driver = { .name = "caam_jr", - .owner = THIS_MODULE, .of_match_table = caam_jr_match, }, .probe = caam_jr_probe, diff --git a/drivers/crypto/ccp/ccp-platform.c b/drivers/crypto/ccp/ccp-platform.c index b0a2806908f..8c50bad25f7 100644 --- a/drivers/crypto/ccp/ccp-platform.c +++ b/drivers/crypto/ccp/ccp-platform.c @@ -208,7 +208,6 @@ static const struct of_device_id ccp_platform_ids[] = { static struct platform_driver ccp_platform_driver = { .driver = { .name = "AMD Cryptographic Coprocessor", - .owner = THIS_MODULE, .of_match_table = ccp_platform_ids, }, .probe = ccp_platform_probe, diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c index 032c72c1f95..f91f15ddee9 100644 --- a/drivers/crypto/mv_cesa.c +++ b/drivers/crypto/mv_cesa.c @@ -1180,7 +1180,6 @@ static struct platform_driver marvell_crypto = { .probe = mv_probe, .remove = mv_remove, .driver = { - .owner = THIS_MODULE, .name = "mv_crypto", .of_match_table = mv_cesa_of_match_table, }, diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c index b5f7e6db24d..829d6394fb3 100644 --- a/drivers/crypto/mxs-dcp.c +++ b/drivers/crypto/mxs-dcp.c @@ -1090,7 +1090,6 @@ static struct platform_driver mxs_dcp_driver = { .remove = mxs_dcp_remove, .driver = { .name = "mxs-dcp", - .owner = THIS_MODULE, .of_match_table = mxs_dcp_dt_ids, }, }; diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index f8e3207fecb..afd136b45f4 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c @@ -2210,7 +2210,6 @@ MODULE_DEVICE_TABLE(of, n2_crypto_match); static struct platform_driver n2_crypto_driver = { .driver = { .name = "n2cp", - .owner = THIS_MODULE, .of_match_table = n2_crypto_match, }, .probe = n2_crypto_probe, @@ -2238,7 +2237,6 @@ MODULE_DEVICE_TABLE(of, n2_mau_match); static struct platform_driver n2_mau_driver = { .driver = { .name = "ncp", - .owner = THIS_MODULE, .of_match_table = n2_mau_match, }, .probe = n2_mau_probe, diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index cb98fa54573..f79dd410ded 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -1314,7 +1314,6 @@ static struct platform_driver omap_aes_driver = { .remove = omap_aes_remove, .driver = { .name = "omap-aes", - .owner = THIS_MODULE, .pm = &omap_aes_pm_ops, .of_match_table = omap_aes_of_match, }, diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c index b8bc84be874..e350f5be4d2 100644 --- a/drivers/crypto/omap-des.c +++ b/drivers/crypto/omap-des.c @@ -1222,7 +1222,6 @@ static struct platform_driver omap_des_driver = { .remove = omap_des_remove, .driver = { .name = "omap-des", - .owner = THIS_MODULE, .pm = &omap_des_pm_ops, .of_match_table = of_match_ptr(omap_des_of_match), }, diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 24ef48965e4..3c76696ee57 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -2029,7 +2029,6 @@ static struct platform_driver omap_sham_driver = { .remove = omap_sham_remove, .driver = { .name = "omap-sham", - .owner = THIS_MODULE, .pm = &omap_sham_pm_ops, .of_match_table = omap_sham_of_match, }, diff --git a/drivers/crypto/qce/core.c b/drivers/crypto/qce/core.c index 33ae3545dc4..718b32a3112 100644 --- a/drivers/crypto/qce/core.c +++ b/drivers/crypto/qce/core.c @@ -273,7 +273,6 @@ static struct platform_driver qce_crypto_driver = { .probe = qce_crypto_probe, .remove = qce_crypto_remove, .driver = { - .owner = THIS_MODULE, .name = KBUILD_MODNAME, .of_match_table = qce_crypto_of_match, }, diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c index 4197ad9a711..f214a875582 100644 --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c @@ -745,7 +745,6 @@ static struct platform_driver s5p_aes_crypto = { .probe = s5p_aes_probe, .remove = s5p_aes_remove, .driver = { - .owner = THIS_MODULE, .name = "s5p-secss", .of_match_table = s5p_sss_dt_match, }, diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index 579f539e597..220b92f7eab 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -1656,7 +1656,6 @@ static struct platform_driver sahara_driver = { .remove = sahara_remove, .driver = { .name = SAHARA_NAME, - .owner = THIS_MODULE, .of_match_table = sahara_dt_ids, }, .id_table = sahara_platform_ids, diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 624b8be0c36..067ec2193d7 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -2811,7 +2811,6 @@ MODULE_DEVICE_TABLE(of, talitos_match); static struct platform_driver talitos_driver = { .driver = { .name = "talitos", - .owner = THIS_MODULE, .of_match_table = talitos_match, }, .probe = talitos_probe, diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 7c035de9055..f831bb952b2 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -1783,7 +1783,6 @@ static struct platform_driver cryp_driver = { .remove = ux500_cryp_remove, .shutdown = ux500_cryp_shutdown, .driver = { - .owner = THIS_MODULE, .name = "cryp1", .of_match_table = ux500_cryp_match, .pm = &ux500_cryp_pm, diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 76ecc8d143d..70a20871e99 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c @@ -1964,7 +1964,6 @@ static struct platform_driver hash_driver = { .remove = ux500_hash_remove, .shutdown = ux500_hash_shutdown, .driver = { - .owner = THIS_MODULE, .name = "hash1", .of_match_table = ux500_hash_match, .pm = &ux500_hash_pm, |