Re: [PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
On Thu, Sep 25, 2014 at 10:35:04PM -0600, Azael Avalos wrote:
> 2014-09-25 21:01 GMT-06:00 Darren Hart :
> > On Tue, Sep 23, 2014 at 06:24:25PM -0600, Azael Avalos wrote:
> >> The function name hci_raw was used before to reflect
> >> a raw (read/write) call to the Toshiba's Hardware
> >> Configuration Interface (HCI), however, since the
> >> introduction of the System Configuration Interface
> >> (SCI), that "name" no longer applies.
> >>
> >> This patch changes the name of that function to
> >> tci_raw (for Toshiba Configuration Interface), and
> >> change the comments about it.
> >
> > I'm not following the motivation for this change. The HCI clearly still
> > exists,
> > at least on the platforms this driver was written to support. When/Where
> > was the
> > "SCI" "introduced" in a way that requires a change here? Was this a change
> > by
> > Toshiba you are refering to?
>
> The HCI and SCI form an integral part of the Toshiba configuration scheme,
> the SCI has been present on any Toshiba branded laptop to date, what
> was not present (at least on toshiba_acpi) was (propper) SCI support
> until the patches I sent.
>
> Take a look at Jonathan Buzzard documentation [1], and also the toshiba
> module under char, the documentation was written in 1999, and the
> module has a (starting) date of 1996.
>
> By the time toshiba_acpi was written, only HCI functions were accessed,
> as well as the configuration handle was (and still is, depending on model)
> named GHCI, and so the comments refer to it, now that we have SCI
> (driver support) on board, the naming seems obsolete, or at least
> misguiding, as the HCI is not the only configuration interface.
>
> Hope this clears things a bit.
>
> [1] http://www.buzzard.me.uk/toshiba/docs.html
What I'm getting from a quick scan of the documents is that both SCI and HCI are
enabled using the same read from B2, but SCI appears to be a superset of HCI (or
perhaps better said we are now using SCI+HCI and not just HCI.
This suggests to me that this driver has grown to include some SCI-specific
commands/features and now it's time to rename the interface to reflect this more
accurately.
Is that more or less the situation?
If this is more or less the lay of things, then please combine the function
definition change and callsite update patch (note that things should always
build at each patch to enable bisection, etc.), update the comments as you noted
below, and submit a V2.
It's a stretch for 3.18 as I'd prefer to have things in linux-next for two weeks
prior to submitting to Linus. Let's see how it goes.
Thanks,
>
> >
> >
> >>
> >> Signed-off-by: Azael Avalos
> >> ---
> >> drivers/platform/x86/toshiba_acpi.c | 40
> >> ++---
> >> 1 file changed, 20 insertions(+), 20 deletions(-)
> >>
> >> diff --git a/drivers/platform/x86/toshiba_acpi.c
> >> b/drivers/platform/x86/toshiba_acpi.c
> >> index edd8f3d..b7030dc 100644
> >> --- a/drivers/platform/x86/toshiba_acpi.c
> >> +++ b/drivers/platform/x86/toshiba_acpi.c
> >> @@ -71,7 +71,7 @@ MODULE_LICENSE("GPL");
> >> /* Toshiba ACPI method paths */
> >> #define METHOD_VIDEO_OUT "\\_SB_.VALX.DSSX"
> >>
> >> -/* Toshiba HCI interface definitions
> >> +/* Toshiba configuration interface definitions
> >> *
> >> * HCI is Toshiba's "Hardware Control Interface" which is supposed to
> >
> > I'm not sure this patch is appropriate/necessary, but if so, you missed a
> > spot
> > here :)
>
> Oh no, this is intentional, what I probably should have done here is be more
> verbose about it, perhaps something like:
>
> /*
> * The Toshiba configuration interface is composed of the HCI and the
> * SCI, which are defined as
> ...
--
Darren Hart
Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
On Thu, Sep 25, 2014 at 10:35:04PM -0600, Azael Avalos wrote: 2014-09-25 21:01 GMT-06:00 Darren Hart dvh...@infradead.org: On Tue, Sep 23, 2014 at 06:24:25PM -0600, Azael Avalos wrote: The function name hci_raw was used before to reflect a raw (read/write) call to the Toshiba's Hardware Configuration Interface (HCI), however, since the introduction of the System Configuration Interface (SCI), that name no longer applies. This patch changes the name of that function to tci_raw (for Toshiba Configuration Interface), and change the comments about it. I'm not following the motivation for this change. The HCI clearly still exists, at least on the platforms this driver was written to support. When/Where was the SCI introduced in a way that requires a change here? Was this a change by Toshiba you are refering to? The HCI and SCI form an integral part of the Toshiba configuration scheme, the SCI has been present on any Toshiba branded laptop to date, what was not present (at least on toshiba_acpi) was (propper) SCI support until the patches I sent. Take a look at Jonathan Buzzard documentation [1], and also the toshiba module under char, the documentation was written in 1999, and the module has a (starting) date of 1996. By the time toshiba_acpi was written, only HCI functions were accessed, as well as the configuration handle was (and still is, depending on model) named GHCI, and so the comments refer to it, now that we have SCI (driver support) on board, the naming seems obsolete, or at least misguiding, as the HCI is not the only configuration interface. Hope this clears things a bit. [1] http://www.buzzard.me.uk/toshiba/docs.html What I'm getting from a quick scan of the documents is that both SCI and HCI are enabled using the same read from B2, but SCI appears to be a superset of HCI (or perhaps better said we are now using SCI+HCI and not just HCI. This suggests to me that this driver has grown to include some SCI-specific commands/features and now it's time to rename the interface to reflect this more accurately. Is that more or less the situation? If this is more or less the lay of things, then please combine the function definition change and callsite update patch (note that things should always build at each patch to enable bisection, etc.), update the comments as you noted below, and submit a V2. It's a stretch for 3.18 as I'd prefer to have things in linux-next for two weeks prior to submitting to Linus. Let's see how it goes. Thanks, Signed-off-by: Azael Avalos coproscef...@gmail.com --- drivers/platform/x86/toshiba_acpi.c | 40 ++--- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index edd8f3d..b7030dc 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -71,7 +71,7 @@ MODULE_LICENSE(GPL); /* Toshiba ACPI method paths */ #define METHOD_VIDEO_OUT \\_SB_.VALX.DSSX -/* Toshiba HCI interface definitions +/* Toshiba configuration interface definitions * * HCI is Toshiba's Hardware Control Interface which is supposed to I'm not sure this patch is appropriate/necessary, but if so, you missed a spot here :) Oh no, this is intentional, what I probably should have done here is be more verbose about it, perhaps something like: /* * The Toshiba configuration interface is composed of the HCI and the * SCI, which are defined as ... -- Darren Hart Intel Open Source Technology Center -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
2014-09-25 21:01 GMT-06:00 Darren Hart :
> On Tue, Sep 23, 2014 at 06:24:25PM -0600, Azael Avalos wrote:
>> The function name hci_raw was used before to reflect
>> a raw (read/write) call to the Toshiba's Hardware
>> Configuration Interface (HCI), however, since the
>> introduction of the System Configuration Interface
>> (SCI), that "name" no longer applies.
>>
>> This patch changes the name of that function to
>> tci_raw (for Toshiba Configuration Interface), and
>> change the comments about it.
>
> I'm not following the motivation for this change. The HCI clearly still
> exists,
> at least on the platforms this driver was written to support. When/Where was
> the
> "SCI" "introduced" in a way that requires a change here? Was this a change by
> Toshiba you are refering to?
The HCI and SCI form an integral part of the Toshiba configuration scheme,
the SCI has been present on any Toshiba branded laptop to date, what
was not present (at least on toshiba_acpi) was (propper) SCI support
until the patches I sent.
Take a look at Jonathan Buzzard documentation [1], and also the toshiba
module under char, the documentation was written in 1999, and the
module has a (starting) date of 1996.
By the time toshiba_acpi was written, only HCI functions were accessed,
as well as the configuration handle was (and still is, depending on model)
named GHCI, and so the comments refer to it, now that we have SCI
(driver support) on board, the naming seems obsolete, or at least
misguiding, as the HCI is not the only configuration interface.
Hope this clears things a bit.
[1] http://www.buzzard.me.uk/toshiba/docs.html
>
>
>>
>> Signed-off-by: Azael Avalos
>> ---
>> drivers/platform/x86/toshiba_acpi.c | 40
>> ++---
>> 1 file changed, 20 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/platform/x86/toshiba_acpi.c
>> b/drivers/platform/x86/toshiba_acpi.c
>> index edd8f3d..b7030dc 100644
>> --- a/drivers/platform/x86/toshiba_acpi.c
>> +++ b/drivers/platform/x86/toshiba_acpi.c
>> @@ -71,7 +71,7 @@ MODULE_LICENSE("GPL");
>> /* Toshiba ACPI method paths */
>> #define METHOD_VIDEO_OUT "\\_SB_.VALX.DSSX"
>>
>> -/* Toshiba HCI interface definitions
>> +/* Toshiba configuration interface definitions
>> *
>> * HCI is Toshiba's "Hardware Control Interface" which is supposed to
>
> I'm not sure this patch is appropriate/necessary, but if so, you missed a spot
> here :)
Oh no, this is intentional, what I probably should have done here is be more
verbose about it, perhaps something like:
/*
* The Toshiba configuration interface is composed of the HCI and the
* SCI, which are defined as
...
>
> --
> Darren Hart
> Intel Open Source Technology Center
Cheers
Azael
--
-- El mundo apesta y vosotros apestais tambien --
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
On Tue, Sep 23, 2014 at 06:24:25PM -0600, Azael Avalos wrote:
> The function name hci_raw was used before to reflect
> a raw (read/write) call to the Toshiba's Hardware
> Configuration Interface (HCI), however, since the
> introduction of the System Configuration Interface
> (SCI), that "name" no longer applies.
>
> This patch changes the name of that function to
> tci_raw (for Toshiba Configuration Interface), and
> change the comments about it.
I'm not following the motivation for this change. The HCI clearly still exists,
at least on the platforms this driver was written to support. When/Where was the
"SCI" "introduced" in a way that requires a change here? Was this a change by
Toshiba you are refering to?
>
> Signed-off-by: Azael Avalos
> ---
> drivers/platform/x86/toshiba_acpi.c | 40
> ++---
> 1 file changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/platform/x86/toshiba_acpi.c
> b/drivers/platform/x86/toshiba_acpi.c
> index edd8f3d..b7030dc 100644
> --- a/drivers/platform/x86/toshiba_acpi.c
> +++ b/drivers/platform/x86/toshiba_acpi.c
> @@ -71,7 +71,7 @@ MODULE_LICENSE("GPL");
> /* Toshiba ACPI method paths */
> #define METHOD_VIDEO_OUT "\\_SB_.VALX.DSSX"
>
> -/* Toshiba HCI interface definitions
> +/* Toshiba configuration interface definitions
> *
> * HCI is Toshiba's "Hardware Control Interface" which is supposed to
I'm not sure this patch is appropriate/necessary, but if so, you missed a spot
here :)
--
Darren Hart
Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
On Tue, Sep 23, 2014 at 06:24:25PM -0600, Azael Avalos wrote: The function name hci_raw was used before to reflect a raw (read/write) call to the Toshiba's Hardware Configuration Interface (HCI), however, since the introduction of the System Configuration Interface (SCI), that name no longer applies. This patch changes the name of that function to tci_raw (for Toshiba Configuration Interface), and change the comments about it. I'm not following the motivation for this change. The HCI clearly still exists, at least on the platforms this driver was written to support. When/Where was the SCI introduced in a way that requires a change here? Was this a change by Toshiba you are refering to? Signed-off-by: Azael Avalos coproscef...@gmail.com --- drivers/platform/x86/toshiba_acpi.c | 40 ++--- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index edd8f3d..b7030dc 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -71,7 +71,7 @@ MODULE_LICENSE(GPL); /* Toshiba ACPI method paths */ #define METHOD_VIDEO_OUT \\_SB_.VALX.DSSX -/* Toshiba HCI interface definitions +/* Toshiba configuration interface definitions * * HCI is Toshiba's Hardware Control Interface which is supposed to I'm not sure this patch is appropriate/necessary, but if so, you missed a spot here :) -- Darren Hart Intel Open Source Technology Center -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
2014-09-25 21:01 GMT-06:00 Darren Hart dvh...@infradead.org: On Tue, Sep 23, 2014 at 06:24:25PM -0600, Azael Avalos wrote: The function name hci_raw was used before to reflect a raw (read/write) call to the Toshiba's Hardware Configuration Interface (HCI), however, since the introduction of the System Configuration Interface (SCI), that name no longer applies. This patch changes the name of that function to tci_raw (for Toshiba Configuration Interface), and change the comments about it. I'm not following the motivation for this change. The HCI clearly still exists, at least on the platforms this driver was written to support. When/Where was the SCI introduced in a way that requires a change here? Was this a change by Toshiba you are refering to? The HCI and SCI form an integral part of the Toshiba configuration scheme, the SCI has been present on any Toshiba branded laptop to date, what was not present (at least on toshiba_acpi) was (propper) SCI support until the patches I sent. Take a look at Jonathan Buzzard documentation [1], and also the toshiba module under char, the documentation was written in 1999, and the module has a (starting) date of 1996. By the time toshiba_acpi was written, only HCI functions were accessed, as well as the configuration handle was (and still is, depending on model) named GHCI, and so the comments refer to it, now that we have SCI (driver support) on board, the naming seems obsolete, or at least misguiding, as the HCI is not the only configuration interface. Hope this clears things a bit. [1] http://www.buzzard.me.uk/toshiba/docs.html Signed-off-by: Azael Avalos coproscef...@gmail.com --- drivers/platform/x86/toshiba_acpi.c | 40 ++--- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index edd8f3d..b7030dc 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -71,7 +71,7 @@ MODULE_LICENSE(GPL); /* Toshiba ACPI method paths */ #define METHOD_VIDEO_OUT \\_SB_.VALX.DSSX -/* Toshiba HCI interface definitions +/* Toshiba configuration interface definitions * * HCI is Toshiba's Hardware Control Interface which is supposed to I'm not sure this patch is appropriate/necessary, but if so, you missed a spot here :) Oh no, this is intentional, what I probably should have done here is be more verbose about it, perhaps something like: /* * The Toshiba configuration interface is composed of the HCI and the * SCI, which are defined as ... -- Darren Hart Intel Open Source Technology Center Cheers Azael -- -- El mundo apesta y vosotros apestais tambien -- -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
The function name hci_raw was used before to reflect
a raw (read/write) call to the Toshiba's Hardware
Configuration Interface (HCI), however, since the
introduction of the System Configuration Interface
(SCI), that "name" no longer applies.
This patch changes the name of that function to
tci_raw (for Toshiba Configuration Interface), and
change the comments about it.
Signed-off-by: Azael Avalos
---
drivers/platform/x86/toshiba_acpi.c | 40 ++---
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/platform/x86/toshiba_acpi.c
b/drivers/platform/x86/toshiba_acpi.c
index edd8f3d..b7030dc 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -71,7 +71,7 @@ MODULE_LICENSE("GPL");
/* Toshiba ACPI method paths */
#define METHOD_VIDEO_OUT "\\_SB_.VALX.DSSX"
-/* Toshiba HCI interface definitions
+/* Toshiba configuration interface definitions
*
* HCI is Toshiba's "Hardware Control Interface" which is supposed to
* be uniform across all their models. Ideally we would just call
@@ -274,10 +274,10 @@ static int write_acpi_int(const char *methodName, int val)
return (status == AE_OK) ? 0 : -EIO;
}
-/* Perform a raw HCI call. Here we don't care about input or output buffer
- * format.
+/* Perform a raw configuration call. Here we don't care about input or output
+ * buffer format.
*/
-static acpi_status hci_raw(struct toshiba_acpi_dev *dev,
+static acpi_status tci_raw(struct toshiba_acpi_dev *dev,
const u32 in[HCI_WORDS], u32 out[HCI_WORDS])
{
struct acpi_object_list params;
@@ -320,7 +320,7 @@ static acpi_status hci_write1(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_SET, reg, in1, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
return status;
}
@@ -330,7 +330,7 @@ static acpi_status hci_read1(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_GET, reg, 0, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*out1 = out[2];
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
return status;
@@ -341,7 +341,7 @@ static acpi_status hci_write2(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_SET, reg, in1, in2, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
return status;
}
@@ -351,7 +351,7 @@ static acpi_status hci_read2(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_GET, reg, *out1, *out2, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*out1 = out[2];
*out2 = out[3];
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
@@ -367,7 +367,7 @@ static int sci_open(struct toshiba_acpi_dev *dev)
u32 out[HCI_WORDS];
acpi_status status;
- status = hci_raw(dev, in, out);
+ status = tci_raw(dev, in, out);
if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
pr_err("ACPI call to open SCI failed\n");
return 0;
@@ -391,7 +391,7 @@ static void sci_close(struct toshiba_acpi_dev *dev)
u32 out[HCI_WORDS];
acpi_status status;
- status = hci_raw(dev, in, out);
+ status = tci_raw(dev, in, out);
if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
pr_err("ACPI call to close SCI failed\n");
return;
@@ -410,7 +410,7 @@ static acpi_status sci_read(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { SCI_GET, reg, 0, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*out1 = out[2];
*result = (ACPI_SUCCESS(status)) ? out[0] : HCI_FAILURE;
return status;
@@ -421,7 +421,7 @@ static acpi_status sci_write(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { SCI_SET, reg, in1, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*result = (ACPI_SUCCESS(status)) ? out[0] : HCI_FAILURE;
return status;
}
@@ -436,7 +436,7 @@ static int toshiba_illumination_available(struct
toshiba_acpi_dev *dev)
if (!sci_open(dev))
return 0;
- status = hci_raw(dev, in, out);
+ status = tci_raw(dev, in, out);
sci_close(dev);
if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
[PATCH 1/4] toshiba_acpi: Rename hci_raw to tci_raw
The function name hci_raw was used before to reflect
a raw (read/write) call to the Toshiba's Hardware
Configuration Interface (HCI), however, since the
introduction of the System Configuration Interface
(SCI), that name no longer applies.
This patch changes the name of that function to
tci_raw (for Toshiba Configuration Interface), and
change the comments about it.
Signed-off-by: Azael Avalos coproscef...@gmail.com
---
drivers/platform/x86/toshiba_acpi.c | 40 ++---
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/platform/x86/toshiba_acpi.c
b/drivers/platform/x86/toshiba_acpi.c
index edd8f3d..b7030dc 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -71,7 +71,7 @@ MODULE_LICENSE(GPL);
/* Toshiba ACPI method paths */
#define METHOD_VIDEO_OUT \\_SB_.VALX.DSSX
-/* Toshiba HCI interface definitions
+/* Toshiba configuration interface definitions
*
* HCI is Toshiba's Hardware Control Interface which is supposed to
* be uniform across all their models. Ideally we would just call
@@ -274,10 +274,10 @@ static int write_acpi_int(const char *methodName, int val)
return (status == AE_OK) ? 0 : -EIO;
}
-/* Perform a raw HCI call. Here we don't care about input or output buffer
- * format.
+/* Perform a raw configuration call. Here we don't care about input or output
+ * buffer format.
*/
-static acpi_status hci_raw(struct toshiba_acpi_dev *dev,
+static acpi_status tci_raw(struct toshiba_acpi_dev *dev,
const u32 in[HCI_WORDS], u32 out[HCI_WORDS])
{
struct acpi_object_list params;
@@ -320,7 +320,7 @@ static acpi_status hci_write1(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_SET, reg, in1, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
return status;
}
@@ -330,7 +330,7 @@ static acpi_status hci_read1(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_GET, reg, 0, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*out1 = out[2];
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
return status;
@@ -341,7 +341,7 @@ static acpi_status hci_write2(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_SET, reg, in1, in2, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
return status;
}
@@ -351,7 +351,7 @@ static acpi_status hci_read2(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { HCI_GET, reg, *out1, *out2, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*out1 = out[2];
*out2 = out[3];
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
@@ -367,7 +367,7 @@ static int sci_open(struct toshiba_acpi_dev *dev)
u32 out[HCI_WORDS];
acpi_status status;
- status = hci_raw(dev, in, out);
+ status = tci_raw(dev, in, out);
if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
pr_err(ACPI call to open SCI failed\n);
return 0;
@@ -391,7 +391,7 @@ static void sci_close(struct toshiba_acpi_dev *dev)
u32 out[HCI_WORDS];
acpi_status status;
- status = hci_raw(dev, in, out);
+ status = tci_raw(dev, in, out);
if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
pr_err(ACPI call to close SCI failed\n);
return;
@@ -410,7 +410,7 @@ static acpi_status sci_read(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { SCI_GET, reg, 0, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*out1 = out[2];
*result = (ACPI_SUCCESS(status)) ? out[0] : HCI_FAILURE;
return status;
@@ -421,7 +421,7 @@ static acpi_status sci_write(struct toshiba_acpi_dev *dev,
u32 reg,
{
u32 in[HCI_WORDS] = { SCI_SET, reg, in1, 0, 0, 0 };
u32 out[HCI_WORDS];
- acpi_status status = hci_raw(dev, in, out);
+ acpi_status status = tci_raw(dev, in, out);
*result = (ACPI_SUCCESS(status)) ? out[0] : HCI_FAILURE;
return status;
}
@@ -436,7 +436,7 @@ static int toshiba_illumination_available(struct
toshiba_acpi_dev *dev)
if (!sci_open(dev))
return 0;
- status = hci_raw(dev, in, out);
+ status = tci_raw(dev, in, out);
sci_close(dev);
if (ACPI_FAILURE(status) || out[0] == HCI_FAILURE) {
