From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Corey Minyard <cminyard@mvista.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
openipmi-developer@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Cc: Corey Minyard <minyard@acm.org>
Subject: [PATCH v2 03/10] ipmi_si: Utilize temporary variable to hold device pointer
Date: Fri, 2 Apr 2021 20:43:27 +0300 [thread overview]
Message-ID: <20210402174334.13466-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210402174334.13466-1-andriy.shevchenko@linux.intel.com>
Introduce a temporary variable to hold a device pointer.
It can be utilized in the ->probe() and save a bit of LOCs.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/char/ipmi/ipmi_si_platform.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c
index e5cd5006f0e5..5f641d316ecb 100644
--- a/drivers/char/ipmi/ipmi_si_platform.c
+++ b/drivers/char/ipmi/ipmi_si_platform.c
@@ -311,6 +311,7 @@ static int find_slave_address(struct si_sm_io *io, int slave_addr)
static int acpi_ipmi_probe(struct platform_device *pdev)
{
+ struct device *dev = &pdev->dev;
struct si_sm_io io;
acpi_handle handle;
acpi_status status;
@@ -320,21 +321,20 @@ static int acpi_ipmi_probe(struct platform_device *pdev)
if (!si_tryacpi)
return -ENODEV;
- handle = ACPI_HANDLE(&pdev->dev);
+ handle = ACPI_HANDLE(dev);
if (!handle)
return -ENODEV;
memset(&io, 0, sizeof(io));
io.addr_source = SI_ACPI;
- dev_info(&pdev->dev, "probing via ACPI\n");
+ dev_info(dev, "probing via ACPI\n");
io.addr_info.acpi_info.acpi_handle = handle;
/* _IFT tells us the interface type: KCS, BT, etc */
status = acpi_evaluate_integer(handle, "_IFT", NULL, &tmp);
if (ACPI_FAILURE(status)) {
- dev_err(&pdev->dev,
- "Could not find ACPI IPMI interface type\n");
+ dev_err(dev, "Could not find ACPI IPMI interface type\n");
return -EINVAL;
}
@@ -351,10 +351,11 @@ static int acpi_ipmi_probe(struct platform_device *pdev)
case 4: /* SSIF, just ignore */
return -ENODEV;
default:
- dev_info(&pdev->dev, "unknown IPMI type %lld\n", tmp);
+ dev_info(dev, "unknown IPMI type %lld\n", tmp);
return -EINVAL;
}
+ io.dev = dev;
io.regsize = DEFAULT_REGSIZE;
io.regshift = 0;
@@ -378,9 +379,7 @@ static int acpi_ipmi_probe(struct platform_device *pdev)
io.slave_addr = find_slave_address(&io, io.slave_addr);
- io.dev = &pdev->dev;
-
- dev_info(io.dev, "%pR regsize %d spacing %d irq %d\n",
+ dev_info(dev, "%pR regsize %d spacing %d irq %d\n",
res, io.regsize, io.regspacing, io.irq);
request_module("acpi_ipmi");
--
2.30.2
next prev parent reply other threads:[~2021-04-02 17:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-02 17:43 [PATCH v2 00/10] ipmi_si: Set of clean ups Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 01/10] ipmi_si: Switch to use platform_get_mem_or_io() Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 02/10] ipmi_si: Remove bogus err_free label Andy Shevchenko
2021-04-02 17:43 ` Andy Shevchenko [this message]
2021-04-02 17:43 ` [PATCH v2 04/10] ipmi_si: Use proper ACPI macros to check error code for failures Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 05/10] ipmi_si: Introduce ipmi_panic_event_str[] array Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 06/10] ipmi_si: Reuse si_to_str[] array in ipmi_hardcode_init_one() Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 07/10] ipmi_si: Get rid of ->addr_source_cleanup() Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 08/10] ipmi_si: Use strstrip() to remove surrounding spaces Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 09/10] ipmi_si: Drop redundant check before calling put_device() Andy Shevchenko
2021-04-02 17:43 ` [PATCH v2 10/10] ipmi_si: Join string literals back Andy Shevchenko
2021-04-02 18:25 ` [PATCH v2 00/10] ipmi_si: Set of clean ups Corey Minyard
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=20210402174334.13466-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=cminyard@mvista.com \
--cc=linux-kernel@vger.kernel.org \
--cc=minyard@acm.org \
--cc=openipmi-developer@lists.sourceforge.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox