From: Stelian Pop <stelian.pop@fr.alcove.com>
To: Marcelo Tosatti <marcelo@conectiva.com.br>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 2.4.21-rc1] sonypi fixes
Date: Wed, 23 Apr 2003 10:04:15 +0200 [thread overview]
Message-ID: <20030423080415.GD820@hottah.alcove-fr> (raw)
Hi,
I've already send this once or twice, but it hasn't been applied yet
to the 2.4 tree.
I've attached below a smaller patch, containing only the obviously
correct changes, so there is no risk involved in applying this.
Original credit goes to Adrian Bunk for the .text.exit related
changes and to Daniel K. for the battery #defines.
Marcelo, please apply.
Stelian.
===== drivers/char/sonypi.c 1.14 vs edited =====
--- 1.14/drivers/char/sonypi.c Tue Feb 18 12:33:33 2003
+++ edited/drivers/char/sonypi.c Mon Mar 31 16:39:06 2003
@@ -162,7 +162,7 @@
}
/* Disables the device - this comes from the AML code in the ACPI bios */
-static void __devexit sonypi_type1_dis(void) {
+static void sonypi_type1_dis(void) {
u32 v;
pci_read_config_dword(sonypi_device.dev, SONYPI_G10A, &v);
@@ -174,7 +174,7 @@
outl(v, SONYPI_IRQ_PORT);
}
-static void __devexit sonypi_type2_dis(void) {
+static void sonypi_type2_dis(void) {
if (ec_write(SONYPI_SHIB, 0))
printk(KERN_WARNING "ec_write failed\n");
if (ec_write(SONYPI_SLOB, 0))
@@ -531,7 +531,7 @@
ret = -EFAULT;
break;
case SONYPI_IOCGBAT1REM:
- if (ec_read16(SONYPI_BAT1_FULL, &val16)) {
+ if (ec_read16(SONYPI_BAT1_LEFT, &val16)) {
ret = -EIO;
break;
}
@@ -539,7 +539,7 @@
ret = -EFAULT;
break;
case SONYPI_IOCGBAT2CAP:
- if (ec_read16(SONYPI_BAT1_FULL, &val16)) {
+ if (ec_read16(SONYPI_BAT2_FULL, &val16)) {
ret = -EIO;
break;
}
@@ -547,7 +547,7 @@
ret = -EFAULT;
break;
case SONYPI_IOCGBAT2REM:
- if (ec_read16(SONYPI_BAT1_FULL, &val16)) {
+ if (ec_read16(SONYPI_BAT2_LEFT, &val16)) {
ret = -EIO;
break;
}
--
Stelian Pop <stelian.pop@fr.alcove.com>
Alcove - http://www.alcove.com
reply other threads:[~2003-04-23 7:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20030423080415.GD820@hottah.alcove-fr \
--to=stelian.pop@fr.alcove.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
/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
all inboxes | Powered by JetHome®