Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 15:40:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

panasonic-laptop: Simplify calls to acpi_pcc_retrieve_biosdata

Browse Source 
Function acpi_pcc_retrieve_biosdata is always called with parameters
(pcc, pcc->sinf), so we can drop the second parameter. It was
dangerous to pass the sinf array separately anyway, as its length is
checked as pcc->num_sifr, which pretty much assumed it was pcc->sinf
(or at least had the same size.)

This change makes the code slightly more compact and thus marginally
faster.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Harald Welte <laforge@gnumonks.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Jean Delvare 2010-10-21 11:50:47 +02:00 committed by Matthew Garrett
parent aa13857f13
commit e253fb944d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/platform/x86/panasonic-laptop.c
View File

@ -267,7 +267,7 @@ static inline int acpi_pcc_get_sqty(struct acpi_device *device)
} }
} }
static int acpi_pcc_retrieve_biosdata(struct pcc_acpi *pcc, u32 *sinf) static int acpi_pcc_retrieve_biosdata(struct pcc_acpi *pcc)
{ {
acpi_status status; acpi_status status;
struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
@ -299,12 +299,12 @@ static int acpi_pcc_retrieve_biosdata(struct pcc_acpi *pcc, u32 *sinf)
for (i = 0; i < hkey->package.count; i++) { for (i = 0; i < hkey->package.count; i++) {
union acpi_object *element = &(hkey->package.elements[i]); union acpi_object *element = &(hkey->package.elements[i]);
if (likely(element->type == ACPI_TYPE_INTEGER)) { if (likely(element->type == ACPI_TYPE_INTEGER)) {
sinf[i] = element->integer.value; pcc->sinf[i] = element->integer.value;
} else } else
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Invalid HKEY.SINF data\n")); "Invalid HKEY.SINF data\n"));
} }
sinf[hkey->package.count] = -1; pcc->sinf[hkey->package.count] = -1;
end: end:
kfree(buffer.pointer); kfree(buffer.pointer);
@ -322,7 +322,7 @@ static int bl_get(struct backlight_device *bd)
{ {
struct pcc_acpi *pcc = bl_get_data(bd); struct pcc_acpi *pcc = bl_get_data(bd);
if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) if (!acpi_pcc_retrieve_biosdata(pcc))
return -EIO; return -EIO;
return pcc->sinf[SINF_AC_CUR_BRIGHT]; return pcc->sinf[SINF_AC_CUR_BRIGHT];
@ -334,7 +334,7 @@ static int bl_set_status(struct backlight_device *bd)
int bright = bd->props.brightness; int bright = bd->props.brightness;
int rc; int rc;
if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) if (!acpi_pcc_retrieve_biosdata(pcc))
return -EIO; return -EIO;
if (bright < pcc->sinf[SINF_AC_MIN_BRIGHT]) if (bright < pcc->sinf[SINF_AC_MIN_BRIGHT])
@ -368,7 +368,7 @@ static ssize_t show_numbatt(struct device *dev, struct device_attribute *attr,
struct acpi_device *acpi = to_acpi_device(dev); struct acpi_device *acpi = to_acpi_device(dev);
struct pcc_acpi *pcc = acpi_driver_data(acpi); struct pcc_acpi *pcc = acpi_driver_data(acpi);
if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) if (!acpi_pcc_retrieve_biosdata(pcc))
return -EIO; return -EIO;
return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_NUM_BATTERIES]); return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_NUM_BATTERIES]);
@ -380,7 +380,7 @@ static ssize_t show_lcdtype(struct device *dev, struct device_attribute *attr,
struct acpi_device *acpi = to_acpi_device(dev); struct acpi_device *acpi = to_acpi_device(dev);
struct pcc_acpi *pcc = acpi_driver_data(acpi); struct pcc_acpi *pcc = acpi_driver_data(acpi);
if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) if (!acpi_pcc_retrieve_biosdata(pcc))
return -EIO; return -EIO;
return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_LCD_TYPE]); return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_LCD_TYPE]);
@ -392,7 +392,7 @@ static ssize_t show_mute(struct device *dev, struct device_attribute *attr,
struct acpi_device *acpi = to_acpi_device(dev); struct acpi_device *acpi = to_acpi_device(dev);
struct pcc_acpi *pcc = acpi_driver_data(acpi); struct pcc_acpi *pcc = acpi_driver_data(acpi);
if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) if (!acpi_pcc_retrieve_biosdata(pcc))
return -EIO; return -EIO;
return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_MUTE]); return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_MUTE]);
@ -404,7 +404,7 @@ static ssize_t show_sticky(struct device *dev, struct device_attribute *attr,
struct acpi_device *acpi = to_acpi_device(dev); struct acpi_device *acpi = to_acpi_device(dev);
struct pcc_acpi *pcc = acpi_driver_data(acpi); struct pcc_acpi *pcc = acpi_driver_data(acpi);
if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) if (!acpi_pcc_retrieve_biosdata(pcc))
return -EIO; return -EIO;
return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_STICKY_KEY]); return snprintf(buf, PAGE_SIZE, "%u\n", pcc->sinf[SINF_STICKY_KEY]);
@ -594,7 +594,7 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
goto out_sinf; goto out_sinf;
} }
if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) { if (!acpi_pcc_retrieve_biosdata(pcc)) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Couldn't retrieve BIOS data\n")); "Couldn't retrieve BIOS data\n"));
result = -EIO; result = -EIO;