aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
commite6b5be2be4e30037eb551e0ed09dd97bd00d85d3 (patch)
tree88801365987a0dc64d62d47e8a11f3b44691c37f /drivers/ide
parent37da7bbbe84fe9e8862940d3f9194fd27dce59bb (diff)
parentf1c488a78d9f1a22cdb15648c15e70fd82ed229a (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/ide')
-rw-r--r--drivers/ide/au1xxx-ide.c1
-rw-r--r--drivers/ide/gayle.c1
-rw-r--r--drivers/ide/ide_platform.c1
-rw-r--r--drivers/ide/palm_bk3710.c1
-rw-r--r--drivers/ide/tx4938ide.c1
-rw-r--r--drivers/ide/tx4939ide.c1
6 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 07ea58084068..4d181a918d72 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -586,7 +586,6 @@ static int au_ide_remove(struct platform_device *dev)
586static struct platform_driver au1200_ide_driver = { 586static struct platform_driver au1200_ide_driver = {
587 .driver = { 587 .driver = {
588 .name = "au1200-ide", 588 .name = "au1200-ide",
589 .owner = THIS_MODULE,
590 }, 589 },
591 .probe = au_ide_probe, 590 .probe = au_ide_probe,
592 .remove = au_ide_remove, 591 .remove = au_ide_remove,
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c
index 97a2f9dc75d8..901e6ebfeb96 100644
--- a/drivers/ide/gayle.c
+++ b/drivers/ide/gayle.c
@@ -179,7 +179,6 @@ static struct platform_driver amiga_gayle_ide_driver = {
179 .remove = __exit_p(amiga_gayle_ide_remove), 179 .remove = __exit_p(amiga_gayle_ide_remove),
180 .driver = { 180 .driver = {
181 .name = "amiga-gayle-ide", 181 .name = "amiga-gayle-ide",
182 .owner = THIS_MODULE,
183 }, 182 },
184}; 183};
185 184
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c
index d48de6de503e..2b43be3bca0a 100644
--- a/drivers/ide/ide_platform.c
+++ b/drivers/ide/ide_platform.c
@@ -125,7 +125,6 @@ static int plat_ide_remove(struct platform_device *pdev)
125static struct platform_driver platform_ide_driver = { 125static struct platform_driver platform_ide_driver = {
126 .driver = { 126 .driver = {
127 .name = "pata_platform", 127 .name = "pata_platform",
128 .owner = THIS_MODULE,
129 }, 128 },
130 .probe = plat_ide_probe, 129 .probe = plat_ide_probe,
131 .remove = plat_ide_remove, 130 .remove = plat_ide_remove,
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index ba20d18c0373..8012e43bf8f6 100644
--- a/drivers/ide/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
@@ -386,7 +386,6 @@ MODULE_ALIAS("platform:palm_bk3710");
386static struct platform_driver platform_bk_driver = { 386static struct platform_driver platform_bk_driver = {
387 .driver = { 387 .driver = {
388 .name = "palm_bk3710", 388 .name = "palm_bk3710",
389 .owner = THIS_MODULE,
390 }, 389 },
391}; 390};
392 391
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 68edd4f58a28..40a3f55b08dd 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -198,7 +198,6 @@ static int __exit tx4938ide_remove(struct platform_device *pdev)
198static struct platform_driver tx4938ide_driver = { 198static struct platform_driver tx4938ide_driver = {
199 .driver = { 199 .driver = {
200 .name = "tx4938ide", 200 .name = "tx4938ide",
201 .owner = THIS_MODULE,
202 }, 201 },
203 .remove = __exit_p(tx4938ide_remove), 202 .remove = __exit_p(tx4938ide_remove),
204}; 203};
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 4ecdee5eca83..67d4a7d4acc8 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -618,7 +618,6 @@ static int tx4939ide_resume(struct platform_device *dev)
618static struct platform_driver tx4939ide_driver = { 618static struct platform_driver tx4939ide_driver = {
619 .driver = { 619 .driver = {
620 .name = MODNAME, 620 .name = MODNAME,
621 .owner = THIS_MODULE,
622 }, 621 },
623 .remove = __exit_p(tx4939ide_remove), 622 .remove = __exit_p(tx4939ide_remove),
624 .resume = tx4939ide_resume, 623 .resume = tx4939ide_resume,