fbdev: fsl-diu-fb: mark wr_reg_wa() static

[linux-2.6-microblaze.git] / drivers / dma / apple-admac.c

diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c
index 3af7956..5b63996 100644 (file)
--- a/drivers/dma/apple-admac.c
+++ b/drivers/dma/apple-admac.c
@@ -128,7 +128,7 @@ struct admac_data {
        int irq;
        int irq_index;
        int nchannels;
-       struct admac_chan channels[];
+       struct admac_chan channels[] __counted_by(nchannels);
 };
 
 struct admac_tx {
@@ -925,7 +925,7 @@ free_reset:
        return err;
 }
 
-static int admac_remove(struct platform_device *pdev)
+static void admac_remove(struct platform_device *pdev)
 {
        struct admac_data *ad = platform_get_drvdata(pdev);
 
@@ -933,8 +933,6 @@ static int admac_remove(struct platform_device *pdev)
        dma_async_device_unregister(&ad->dma);
        free_irq(ad->irq, ad);
        reset_control_rearm(ad->rstc);
-
-       return 0;
 }
 
 static const struct of_device_id admac_of_match[] = {
@@ -949,7 +947,7 @@ static struct platform_driver apple_admac_driver = {
                .of_match_table = admac_of_match,
        },
        .probe = admac_probe,
-       .remove = admac_remove,
+       .remove_new = admac_remove,
 };
 module_platform_driver(apple_admac_driver);