diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:24:23 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-22 05:07:03 -0500 |
commit | 042a190944675bc54790bcf45b8b2c86e68f003b (patch) | |
tree | dda2377fde97045485bfd056d8d283498a625877 | |
parent | 06f25510692385ed4dadd23f7d3d064d1ab11c2d (diff) |
mtd: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/devices/sst25l.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/esb2rom.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/ichxrom.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 080cb1c1887d..0b3f17361acb 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c | |||
@@ -705,7 +705,7 @@ struct flash_info { | |||
705 | #define IS_POW2PS 0x0001 /* uses 2^N byte pages */ | 705 | #define IS_POW2PS 0x0001 /* uses 2^N byte pages */ |
706 | }; | 706 | }; |
707 | 707 | ||
708 | static struct flash_info __devinitdata dataflash_data [] = { | 708 | static struct flash_info dataflash_data [] = { |
709 | 709 | ||
710 | /* | 710 | /* |
711 | * NOTE: chips with SUP_POW2PS (rev D and up) need two entries, | 711 | * NOTE: chips with SUP_POW2PS (rev D and up) need two entries, |
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c index ab4154deee0f..e4f233941bf6 100644 --- a/drivers/mtd/devices/sst25l.c +++ b/drivers/mtd/devices/sst25l.c | |||
@@ -64,7 +64,7 @@ struct flash_info { | |||
64 | 64 | ||
65 | #define to_sst25l_flash(x) container_of(x, struct sst25l_flash, mtd) | 65 | #define to_sst25l_flash(x) container_of(x, struct sst25l_flash, mtd) |
66 | 66 | ||
67 | static struct flash_info __devinitdata sst25l_flash_info[] = { | 67 | static struct flash_info sst25l_flash_info[] = { |
68 | {"sst25lf020a", 0xbf43, 256, 1024, 4096}, | 68 | {"sst25lf020a", 0xbf43, 256, 1024, 4096}, |
69 | {"sst25lf040a", 0xbf44, 256, 2048, 4096}, | 69 | {"sst25lf040a", 0xbf44, 256, 2048, 4096}, |
70 | }; | 70 | }; |
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c index 3797825ab287..664303f11f08 100644 --- a/drivers/mtd/maps/esb2rom.c +++ b/drivers/mtd/maps/esb2rom.c | |||
@@ -384,7 +384,7 @@ static void __devexit esb2rom_remove_one (struct pci_dev *pdev) | |||
384 | esb2rom_cleanup(window); | 384 | esb2rom_cleanup(window); |
385 | } | 385 | } |
386 | 386 | ||
387 | static struct pci_device_id esb2rom_pci_tbl[] __devinitdata = { | 387 | static struct pci_device_id esb2rom_pci_tbl[] = { |
388 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, | 388 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, |
389 | PCI_ANY_ID, PCI_ANY_ID, }, | 389 | PCI_ANY_ID, PCI_ANY_ID, }, |
390 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, | 390 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, |
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c index a9bab67d2a87..9673601c3833 100644 --- a/drivers/mtd/maps/ichxrom.c +++ b/drivers/mtd/maps/ichxrom.c | |||
@@ -321,7 +321,7 @@ static void __devexit ichxrom_remove_one (struct pci_dev *pdev) | |||
321 | ichxrom_cleanup(window); | 321 | ichxrom_cleanup(window); |
322 | } | 322 | } |
323 | 323 | ||
324 | static struct pci_device_id ichxrom_pci_tbl[] __devinitdata = { | 324 | static struct pci_device_id ichxrom_pci_tbl[] = { |
325 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, | 325 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0, |
326 | PCI_ANY_ID, PCI_ANY_ID, }, | 326 | PCI_ANY_ID, PCI_ANY_ID, }, |
327 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, | 327 | { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, |
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index f779e6a3d4b2..09f75a57e832 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c | |||
@@ -841,7 +841,7 @@ static int __devexit mpc5121_nfc_remove(struct platform_device *op) | |||
841 | return 0; | 841 | return 0; |
842 | } | 842 | } |
843 | 843 | ||
844 | static struct of_device_id mpc5121_nfc_match[] __devinitdata = { | 844 | static struct of_device_id mpc5121_nfc_match[] = { |
845 | { .compatible = "fsl,mpc5121-nfc", }, | 845 | { .compatible = "fsl,mpc5121-nfc", }, |
846 | {}, | 846 | {}, |
847 | }; | 847 | }; |