From: Michael Schmitz <schmitzmic@gmail.com> To: linux-m68k@vger.kernel.org, linux-ide@vger.kernel.org Cc: geert@linux-m68k.org, b.zolnierkie@samsung.com, Michael Schmitz <schmitzmic@gmail.com> Subject: [PATCH RESEND v2 2/2] drivers/ata: convert pata_falcon to arch platform device Date: Thu, 26 Sep 2019 15:54:24 +1200 Message-ID: <1569470064-3977-3-git-send-email-schmitzmic@gmail.com> (raw) In-Reply-To: <1569470064-3977-1-git-send-email-schmitzmic@gmail.com> The Atari platform device setup now provides a platform device for the Falcon IDE interface. Use this in place of the simple platform device set up in the old pata_falcon probe code. Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> -- Changes from v1 - drop obsolete ATA_HD_BASE define - use dev_err() to report error obtaining platform resource --- drivers/ata/pata_falcon.c | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/drivers/ata/pata_falcon.c b/drivers/ata/pata_falcon.c index 41e0d6a..0e6c6b6 100644 --- a/drivers/ata/pata_falcon.c +++ b/drivers/ata/pata_falcon.c @@ -33,7 +33,6 @@ #define DRV_NAME "pata_falcon" #define DRV_VERSION "0.1.0" -#define ATA_HD_BASE 0xfff00000 #define ATA_HD_CONTROL 0x39 static struct scsi_host_template pata_falcon_sht = { @@ -120,24 +119,22 @@ static int pata_falcon_set_mode(struct ata_link *link, .set_mode = pata_falcon_set_mode, }; -static int pata_falcon_init_one(void) +static int __init pata_falcon_init_one(struct platform_device *pdev) { + struct resource *res; struct ata_host *host; struct ata_port *ap; - struct platform_device *pdev; void __iomem *base; - if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE)) - return -ENODEV; - - pr_info(DRV_NAME ": Atari Falcon PATA controller\n"); + dev_info(&pdev->dev, ": Atari Falcon PATA controller\n"); - pdev = platform_device_register_simple(DRV_NAME, 0, NULL, 0); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; - if (!devm_request_mem_region(&pdev->dev, ATA_HD_BASE, 0x40, DRV_NAME)) { - pr_err(DRV_NAME ": resources busy\n"); + if (!devm_request_mem_region(&pdev->dev, res->start, + resource_size(res), DRV_NAME)) { + dev_err(&pdev->dev, "resources busy\n"); return -EBUSY; } @@ -152,7 +149,7 @@ static int pata_falcon_init_one(void) ap->flags |= ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_IORDY; ap->flags |= ATA_FLAG_PIO_POLLING; - base = (void __iomem *)ATA_HD_BASE; + base = (void __iomem *)res->start; ap->ioaddr.data_addr = base; ap->ioaddr.error_addr = base + 1 + 1 * 4; ap->ioaddr.feature_addr = base + 1 + 1 * 4; @@ -174,9 +171,26 @@ static int pata_falcon_init_one(void) return ata_host_activate(host, 0, NULL, 0, &pata_falcon_sht); } -module_init(pata_falcon_init_one); +static int __exit pata_falcon_remove_one(struct platform_device *pdev) +{ + struct ata_host *host = platform_get_drvdata(pdev); + + ata_host_detach(host); + + return 0; +} + +static struct platform_driver pata_falcon_driver = { + .remove = __exit_p(pata_falcon_remove_one), + .driver = { + .name = "atari-falcon-ide", + }, +}; + +module_platform_driver_probe(pata_falcon_driver, pata_falcon_init_one); MODULE_AUTHOR("Bartlomiej Zolnierkiewicz"); MODULE_DESCRIPTION("low-level driver for Atari Falcon PATA"); MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:atari-falcon-ide"); MODULE_VERSION(DRV_VERSION); -- 1.7.0.4
next prev parent reply index Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-26 3:54 [PATCH RESEND v2 0/2] Convert Atari Falcon IDE driver to " Michael Schmitz 2019-09-26 3:54 ` [PATCH RESEND v2 1/2] m68k/atari: add platform device for Falcon IDE port Michael Schmitz 2019-11-04 10:56 ` Geert Uytterhoeven 2019-11-04 21:09 ` Michael Schmitz 2019-11-05 6:37 ` [PATCH] ide: falconide: convert to platform driver Michael Schmitz 2019-11-05 8:11 ` Geert Uytterhoeven 2019-11-05 18:31 ` Michael Schmitz 2019-11-05 18:46 ` Geert Uytterhoeven 2019-11-05 20:02 ` Michael Schmitz 2019-11-05 21:13 ` Michael Schmitz 2019-11-05 21:43 ` Geert Uytterhoeven 2019-11-06 1:35 ` Michael Schmitz 2019-11-05 6:43 ` [PATCH RESEND v2 1/2] m68k/atari: add platform device for Falcon IDE port Michael Schmitz 2019-09-26 3:54 ` Michael Schmitz [this message] 2019-11-04 10:58 ` [PATCH RESEND v2 2/2] drivers/ata: convert pata_falcon to arch platform device Geert Uytterhoeven 2019-10-25 20:33 ` [PATCH RESEND v2 0/2] Convert Atari Falcon IDE driver to " Jens Axboe 2019-10-26 18:17 ` Geert Uytterhoeven 2019-10-28 7:03 ` Michael Schmitz 2019-11-04 11:04 ` Geert Uytterhoeven 2019-11-04 19:17 ` Michael Schmitz 2019-11-04 20:06 ` Geert Uytterhoeven 2019-11-04 21:10 ` John Paul Adrian Glaubitz 2019-11-04 21:21 ` Michael Schmitz 2019-11-04 21:42 ` John Paul Adrian Glaubitz 2019-11-05 6:57 ` Michael Schmitz 2019-11-06 1:34 ` Michael Schmitz 2019-11-06 2:47 ` [PATCH v3] m68k/atari: convert legacy Falcon IDE driver to platform driver Michael Schmitz 2019-11-18 9:20 ` Geert Uytterhoeven 2019-11-18 9:41 ` John Paul Adrian Glaubitz
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1569470064-3977-3-git-send-email-schmitzmic@gmail.com \ --to=schmitzmic@gmail.com \ --cc=b.zolnierkie@samsung.com \ --cc=geert@linux-m68k.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-m68k@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-ide Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-ide/0 linux-ide/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-ide linux-ide/ https://lore.kernel.org/linux-ide \ linux-ide@vger.kernel.org public-inbox-index linux-ide Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-ide AGPL code for this site: git clone https://public-inbox.org/public-inbox.git