From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227NSTi7DhwDgxy6E8RTVD109RJBGFdakybo9RCrIZsw1vLgoEq3vD9PqS/027fDF8ld5zgM ARC-Seal: i=1; a=rsa-sha256; t=1516844488; cv=none; d=google.com; s=arc-20160816; b=0IucuCUazdQhfXrWuLukU1H13Jjl0heYwmjjvyXc2odV20wZVXlYyqRC27aATjAcKL 1Bb6CuvwAHzlh6TqXQ8i6AwnbYG2mSxxDyDmNoLLaa9IB11qu747FhXtjWqpYdyGrCEK C8LXMLx4++nPys5PckteeLmEv3TDyNSOT03XDuV6+6+RV1LZyKdsZC9BUX6CoJHZOf+x mTXaJAiRtl4Fl60lJzc3xYf2cMsLtIzZQkItrte1PMPrCRHw2RGUUTEjKg8jAJg6wr8z fua3o7TKFuZ+9C1SkSABmKR55KQ1bbg7n3bvLp4lrXPYh7ryjldJ/Qzl6WVHQ1Qd2/qe geBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature:arc-authentication-results; bh=LXzbNdM3VkMaIOG5ELxBk+dRJy/rUtamYLoQX0ZsKWA=; b=u8apufZoS1T38YiOJq38Vphv8m+KvPqHuUgH5oBjAIoIXLotde/BhH6A/8huo1+Yyb VQqtEoWt16VO9TlsoHJSA9utLUrLxuyA9JcvoLtPii/b+/5EA/eUks+DLUWTnmaxsFpE b4P1+1/60mOzWPNFdgpoOWpK0dnrpeqsTafb/lm1IRZzuE5pC3v0uVKN25ffECs8sX/q IXNT8iHpKEc09F58liikCA9dzybE20gqOtFzz2oksxR/9onR1TWhyk4p7k5G9sdXF6OW eqj93mT62s5pUsLJ0sF+6Z19r2uBruRBGwJQji4pYMvYu6SyA0Q/1NwvKUo/eNrr3iFr vD7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm1 header.b=rJtW0vBb; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=B2Dg8On5; spf=pass (google.com: domain of samuel@sholland.org designates 66.111.4.27 as permitted sender) smtp.mailfrom=samuel@sholland.org Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm1 header.b=rJtW0vBb; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=B2Dg8On5; spf=pass (google.com: domain of samuel@sholland.org designates 66.111.4.27 as permitted sender) smtp.mailfrom=samuel@sholland.org X-ME-Sender: From: Samuel Holland To: linux-kernel@vger.kernel.org, Greg Kroah-Hartman Cc: coreboot@coreboot.org, Thierry Escande , Wei-Ning Huang , Julius Werner , Dmitry Torokhov , Guenter Roeck , Samuel Holland Subject: [PATCH 3/5] firmware: vpd: Probe via coreboot bus Date: Wed, 24 Jan 2018 19:41:18 -0600 Message-Id: <20180125014120.20851-4-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180125014120.20851-1-samuel@sholland.org> References: <20180125014120.20851-1-samuel@sholland.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590526726161947018?= X-GMAIL-MSGID: =?utf-8?q?1590526726161947018?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Remove the ad-hoc coreboot table search. Now the driver will only be probed when the necessary coreboot table entry has already been found. Furthermore, since the coreboot bus takes care of creating the device, a separate platform device is no longer needed. Signed-off-by: Samuel Holland --- drivers/firmware/google/vpd.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c index e4b40f2b4627..e9db895916c3 100644 --- a/drivers/firmware/google/vpd.c +++ b/drivers/firmware/google/vpd.c @@ -286,20 +286,15 @@ static int vpd_sections_init(phys_addr_t physaddr) return 0; } -static int vpd_probe(struct platform_device *pdev) +static int vpd_probe(struct coreboot_device *dev) { int ret; - struct lb_cbmem_ref entry; - - ret = coreboot_table_find(CB_TAG_VPD, &entry, sizeof(entry)); - if (ret) - return ret; vpd_kobj = kobject_create_and_add("vpd", firmware_kobj); if (!vpd_kobj) return -ENOMEM; - ret = vpd_sections_init(entry.cbmem_addr); + ret = vpd_sections_init(dev->cbmem_ref.cbmem_addr); if (ret) { kobject_put(vpd_kobj); return ret; @@ -308,7 +303,7 @@ static int vpd_probe(struct platform_device *pdev) return 0; } -static int vpd_remove(struct platform_device *pdev) +static int vpd_remove(struct coreboot_device *dev) { vpd_section_destroy(&ro_vpd); vpd_section_destroy(&rw_vpd); @@ -318,41 +313,27 @@ static int vpd_remove(struct platform_device *pdev) return 0; } -static struct platform_driver vpd_driver = { +static struct coreboot_driver vpd_driver = { .probe = vpd_probe, .remove = vpd_remove, - .driver = { + .drv = { .name = "vpd", }, + .tag = CB_TAG_VPD, }; -static struct platform_device *vpd_pdev; - -static int __init vpd_platform_init(void) +static int __init coreboot_vpd_init(void) { - int ret; - - ret = platform_driver_register(&vpd_driver); - if (ret) - return ret; - - vpd_pdev = platform_device_register_simple("vpd", -1, NULL, 0); - if (IS_ERR(vpd_pdev)) { - platform_driver_unregister(&vpd_driver); - return PTR_ERR(vpd_pdev); - } - - return 0; + return coreboot_driver_register(&vpd_driver); } -static void __exit vpd_platform_exit(void) +static void __exit coreboot_vpd_exit(void) { - platform_device_unregister(vpd_pdev); - platform_driver_unregister(&vpd_driver); + coreboot_driver_unregister(&vpd_driver); } -module_init(vpd_platform_init); -module_exit(vpd_platform_exit); +module_init(coreboot_vpd_init); +module_exit(coreboot_vpd_exit); MODULE_AUTHOR("Google, Inc."); MODULE_LICENSE("GPL"); -- 2.13.6