diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:23:07 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-22 05:07:03 -0500 |
commit | 06f25510692385ed4dadd23f7d3d064d1ab11c2d (patch) | |
tree | 2affb62af83cf8082caf40ff4e68a5b1f8725e4e /drivers/mtd/nand/gpmi-nand/gpmi-nand.c | |
parent | 5153b88cac39b0a14662f0e15439b826bacfe213 (diff) |
mtd: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd/nand/gpmi-nand/gpmi-nand.c')
-rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 7ce6d01a3c94..2a251c95a703 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | |||
@@ -319,7 +319,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this, | |||
319 | return 0; | 319 | return 0; |
320 | } | 320 | } |
321 | 321 | ||
322 | static int __devinit | 322 | static int |
323 | acquire_register_block(struct gpmi_nand_data *this, const char *res_name) | 323 | acquire_register_block(struct gpmi_nand_data *this, const char *res_name) |
324 | { | 324 | { |
325 | struct platform_device *pdev = this->pdev; | 325 | struct platform_device *pdev = this->pdev; |
@@ -360,7 +360,7 @@ static void release_register_block(struct gpmi_nand_data *this) | |||
360 | res->bch_regs = NULL; | 360 | res->bch_regs = NULL; |
361 | } | 361 | } |
362 | 362 | ||
363 | static int __devinit | 363 | static int |
364 | acquire_bch_irq(struct gpmi_nand_data *this, irq_handler_t irq_h) | 364 | acquire_bch_irq(struct gpmi_nand_data *this, irq_handler_t irq_h) |
365 | { | 365 | { |
366 | struct platform_device *pdev = this->pdev; | 366 | struct platform_device *pdev = this->pdev; |
@@ -427,7 +427,7 @@ static void release_dma_channels(struct gpmi_nand_data *this) | |||
427 | } | 427 | } |
428 | } | 428 | } |
429 | 429 | ||
430 | static int __devinit acquire_dma_channels(struct gpmi_nand_data *this) | 430 | static int acquire_dma_channels(struct gpmi_nand_data *this) |
431 | { | 431 | { |
432 | struct platform_device *pdev = this->pdev; | 432 | struct platform_device *pdev = this->pdev; |
433 | struct resource *r_dma; | 433 | struct resource *r_dma; |
@@ -492,7 +492,7 @@ static char *extra_clks_for_mx6q[GPMI_CLK_MAX] = { | |||
492 | "gpmi_apb", "gpmi_bch", "gpmi_bch_apb", "per1_bch", | 492 | "gpmi_apb", "gpmi_bch", "gpmi_bch_apb", "per1_bch", |
493 | }; | 493 | }; |
494 | 494 | ||
495 | static int __devinit gpmi_get_clks(struct gpmi_nand_data *this) | 495 | static int gpmi_get_clks(struct gpmi_nand_data *this) |
496 | { | 496 | { |
497 | struct resources *r = &this->resources; | 497 | struct resources *r = &this->resources; |
498 | char **extra_clks = NULL; | 498 | char **extra_clks = NULL; |
@@ -538,7 +538,7 @@ err_clock: | |||
538 | return -ENOMEM; | 538 | return -ENOMEM; |
539 | } | 539 | } |
540 | 540 | ||
541 | static int __devinit acquire_resources(struct gpmi_nand_data *this) | 541 | static int acquire_resources(struct gpmi_nand_data *this) |
542 | { | 542 | { |
543 | struct pinctrl *pinctrl; | 543 | struct pinctrl *pinctrl; |
544 | int ret; | 544 | int ret; |
@@ -588,7 +588,7 @@ static void release_resources(struct gpmi_nand_data *this) | |||
588 | release_dma_channels(this); | 588 | release_dma_channels(this); |
589 | } | 589 | } |
590 | 590 | ||
591 | static int __devinit init_hardware(struct gpmi_nand_data *this) | 591 | static int init_hardware(struct gpmi_nand_data *this) |
592 | { | 592 | { |
593 | int ret; | 593 | int ret; |
594 | 594 | ||
@@ -1542,7 +1542,7 @@ static void gpmi_nfc_exit(struct gpmi_nand_data *this) | |||
1542 | gpmi_free_dma_buffer(this); | 1542 | gpmi_free_dma_buffer(this); |
1543 | } | 1543 | } |
1544 | 1544 | ||
1545 | static int __devinit gpmi_nfc_init(struct gpmi_nand_data *this) | 1545 | static int gpmi_nfc_init(struct gpmi_nand_data *this) |
1546 | { | 1546 | { |
1547 | struct mtd_info *mtd = &this->mtd; | 1547 | struct mtd_info *mtd = &this->mtd; |
1548 | struct nand_chip *chip = &this->nand; | 1548 | struct nand_chip *chip = &this->nand; |
@@ -1625,7 +1625,7 @@ static const struct of_device_id gpmi_nand_id_table[] = { | |||
1625 | }; | 1625 | }; |
1626 | MODULE_DEVICE_TABLE(of, gpmi_nand_id_table); | 1626 | MODULE_DEVICE_TABLE(of, gpmi_nand_id_table); |
1627 | 1627 | ||
1628 | static int __devinit gpmi_nand_probe(struct platform_device *pdev) | 1628 | static int gpmi_nand_probe(struct platform_device *pdev) |
1629 | { | 1629 | { |
1630 | struct gpmi_nand_data *this; | 1630 | struct gpmi_nand_data *this; |
1631 | const struct of_device_id *of_id; | 1631 | const struct of_device_id *of_id; |