From: Corentin Chary <corentincj@iksaif.net>
To: platform-driver-x86@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
Matthew Garrett <mjg@redhat.com>,
Corentin Chary <corentincj@iksaif.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 07/16] samsung-laptop: remove selftest
Date: Sat, 26 Nov 2011 11:00:04 +0100 [thread overview]
Message-ID: <1322301613-8801-8-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1322301613-8801-1-git-send-email-corentincj@iksaif.net>
We can now do the self test using debugfs, so remove the code
and keep the debug flag to enable more traces.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/platform/x86/samsung-laptop.c | 77 +++-----------------------------
1 files changed, 8 insertions(+), 69 deletions(-)
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index 6cbf2ed..638b368 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -362,52 +362,6 @@ static int sabi_set_commandb(struct samsung_laptop *samsung,
return sabi_command(samsung, command, &in, NULL);
}
-static void test_backlight(struct samsung_laptop *samsung)
-{
- const struct sabi_commands *commands = &samsung->config->commands;
- struct sabi_data sretval;
-
- sabi_command(samsung, commands->get_backlight, NULL, &sretval);
- printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.data[0]);
-
- sabi_set_commandb(samsung, commands->set_backlight, 0);
- printk(KERN_DEBUG "backlight should be off\n");
-
- sabi_command(samsung, commands->get_backlight, NULL, &sretval);
- printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.data[0]);
-
- msleep(1000);
-
- sabi_set_commandb(samsung, commands->set_backlight, 1);
- printk(KERN_DEBUG "backlight should be on\n");
-
- sabi_command(samsung, commands->get_backlight, NULL, &sretval);
- printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.data[0]);
-}
-
-static void test_wireless(struct samsung_laptop *samsung)
-{
- const struct sabi_commands *commands = &samsung->config->commands;
- struct sabi_data sretval;
-
- sabi_command(samsung, commands->get_wireless_button, NULL, &sretval);
- printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.data[0]);
-
- sabi_set_commandb(samsung, commands->set_wireless_button, 0);
- printk(KERN_DEBUG "wireless led should be off\n");
-
- sabi_command(samsung, commands->get_wireless_button, NULL, &sretval);
- printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.data[0]);
-
- msleep(1000);
-
- sabi_set_commandb(samsung, commands->set_wireless_button, 1);
- printk(KERN_DEBUG "wireless led should be on\n");
-
- sabi_command(samsung, commands->get_wireless_button, NULL, &sretval);
- printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.data[0]);
-}
-
static int read_brightness(struct samsung_laptop *samsung)
{
const struct sabi_config *config = samsung->config;
@@ -840,12 +794,14 @@ static void samsung_sabi_exit(struct samsung_laptop *samsung)
samsung->config = NULL;
}
-static __init void samsung_sabi_infos(struct samsung_laptop *samsung, int loca)
+static __init void samsung_sabi_infos(struct samsung_laptop *samsung, int loca,
+ unsigned int ifaceP)
{
const struct sabi_config *config = samsung->config;
printk(KERN_DEBUG "This computer supports SABI==%x\n",
loca + 0xf0000 - 6);
+
printk(KERN_DEBUG "SABI header:\n");
printk(KERN_DEBUG " SMI Port Number = 0x%04x\n",
readw(samsung->sabi + config->header_offsets.port));
@@ -859,23 +815,8 @@ static __init void samsung_sabi_infos(struct samsung_laptop *samsung, int loca)
readw(samsung->sabi + config->header_offsets.data_offset));
printk(KERN_DEBUG " SABI data segment = 0x%04x\n",
readw(samsung->sabi + config->header_offsets.data_segment));
-}
-
-static void __init samsung_sabi_selftest(struct samsung_laptop *samsung,
- unsigned int ifaceP)
-{
- const struct sabi_config *config = samsung->config;
- struct sabi_data sretval;
-
- printk(KERN_DEBUG "ifaceP = 0x%08x\n", ifaceP);
- printk(KERN_DEBUG "sabi_iface = %p\n", samsung->sabi_iface);
- if (samsung->handle_backlight)
- test_backlight(samsung);
- test_wireless(samsung);
-
- sabi_command(samsung, config->commands.get_brightness, NULL, &sretval);
- printk(KERN_DEBUG "brightness = 0x%02x\n", sretval.data[0]);
+ printk(KERN_DEBUG " SABI pointer = 0x%08x\n", ifaceP);
}
static int __init samsung_sabi_init(struct samsung_laptop *samsung)
@@ -916,12 +857,13 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung)
loca += 1;
samsung->sabi = (samsung->f0000_segment + loca);
- if (debug)
- samsung_sabi_infos(samsung, loca);
-
/* Get a pointer to the SABI Interface */
ifaceP = (readw(samsung->sabi + config->header_offsets.data_segment) & 0x0ffff) << 4;
ifaceP += readw(samsung->sabi + config->header_offsets.data_offset) & 0x0ffff;
+
+ if (debug)
+ samsung_sabi_infos(samsung, loca, ifaceP);
+
samsung->sabi_iface = ioremap_nocache(ifaceP, 16);
if (!samsung->sabi_iface) {
pr_err("Can't remap %x\n", ifaceP);
@@ -929,9 +871,6 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung)
goto exit;
}
- if (debug)
- samsung_sabi_selftest(samsung, ifaceP);
-
/* Turn on "Linux" mode in the BIOS */
if (commands->set_linux != 0xff) {
int retval = sabi_set_commandb(samsung,
--
1.7.5.4
next prev parent reply other threads:[~2011-11-26 10:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1322301613-8801-1-git-send-email-corentincj@iksaif.net>
2011-11-26 9:59 ` [PATCH v2 01/16] samsung-laptop: put all local variables in a single structure Corentin Chary
2011-11-26 9:59 ` [PATCH v2 02/16] samsung-laptop: move code into init/exit functions Corentin Chary
2011-11-26 10:00 ` [PATCH v2 03/16] samsung-laptop: don't handle backlight if handled by acpi/video Corentin Chary
2011-11-27 4:20 ` Greg KH
2011-11-26 10:00 ` [PATCH v2 04/16] samsung-laptop: use a sysfs group Corentin Chary
2011-11-26 10:00 ` [PATCH v2 05/16] samsung-laptop: ehance SABI support Corentin Chary
2011-11-26 10:00 ` [PATCH v2 06/16] samsung-laptop: add a small debugfs interface Corentin Chary
2011-11-26 10:00 ` Corentin Chary [this message]
2011-11-26 10:00 ` [PATCH v2 08/16] samsung-laptop: add battery life extender support Corentin Chary
2011-11-26 10:00 ` [PATCH v2 09/16] samsung-laptop: add usb charge support Corentin Chary
2011-11-26 10:00 ` [PATCH v2 10/16] samsung-laptop: cleanup KConfig Corentin Chary
2011-11-28 16:01 ` Seth Forshee
2011-11-28 21:05 ` Corentin Chary
2011-11-26 10:00 ` [PATCH v2 11/16] samsung-laptop: add keyboard backlight support Corentin Chary
2011-11-27 4:20 ` Greg KH
2011-11-26 10:00 ` [PATCH v2 12/16] samsung-laptop: add true rfkill support for swsmi Corentin Chary
2011-11-27 4:21 ` Greg KH
2011-11-26 10:00 ` [PATCH v2 13/16] samsung-laptop: make the dmi check less strict Corentin Chary
2011-11-27 4:21 ` Greg KH
2011-11-26 10:00 ` [PATCH v2 14/16] samsung-laptop: dump model and version informations Corentin Chary
2011-11-27 4:22 ` Greg KH
2011-11-26 10:00 ` [PATCH v2 15/16] samsung-laptop: tweak traces Corentin Chary
2011-11-27 4:22 ` Greg KH
2011-11-26 10:00 ` [PATCH v2 16/16] samsung-laptop: promote myself as maintainer of samsung-laptop Corentin Chary
2011-11-27 4:22 ` Greg KH
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=1322301613-8801-8-git-send-email-corentincj@iksaif.net \
--to=corentincj@iksaif.net \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
/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®