From: Finn Thain <fthain@telegraphics.com.au>
To: <linux-kernel@vger.kernel.org>, <linux-m68k@vger.kernel.org>,
<linuxppc-dev@lists.ozlabs.org>,
Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
Darren Hart <dvhart@infradead.org>,
ibm-acpi-devel@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Subject: [RFC v5 07/26] x86/thinkpad_acpi: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte()
Date: Sat, 25 Jul 2015 17:46:06 +1000 [thread overview]
Message-ID: <20150725074601.243339467@telegraphics.com.au> (raw)
In-Reply-To: 20150725074559.543547894@telegraphics.com.au
Make use of arch_nvram_ops in the thinkpad_acpi driver so that the
nvram_* function exports can be removed.
This patch series was tested on a ThinkPad T43.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
---
drivers/platform/x86/thinkpad_acpi.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
Index: linux/drivers/platform/x86/thinkpad_acpi.c
===================================================================
--- linux.orig/drivers/platform/x86/thinkpad_acpi.c 2015-07-25 17:42:34.000000000 +1000
+++ linux/drivers/platform/x86/thinkpad_acpi.c 2015-07-25 17:45:32.000000000 +1000
@@ -2312,30 +2312,30 @@ static void hotkey_read_nvram(struct tp_
u8 d;
if (m & TP_NVRAM_HKEY_GROUP_HK2) {
- d = nvram_read_byte(TP_NVRAM_ADDR_HK2);
+ d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_HK2);
n->thinkpad_toggle = !!(d & TP_NVRAM_MASK_HKT_THINKPAD);
n->zoom_toggle = !!(d & TP_NVRAM_MASK_HKT_ZOOM);
n->display_toggle = !!(d & TP_NVRAM_MASK_HKT_DISPLAY);
n->hibernate_toggle = !!(d & TP_NVRAM_MASK_HKT_HIBERNATE);
}
if (m & TP_ACPI_HKEY_THNKLGHT_MASK) {
- d = nvram_read_byte(TP_NVRAM_ADDR_THINKLIGHT);
+ d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_THINKLIGHT);
n->thinklight_toggle = !!(d & TP_NVRAM_MASK_THINKLIGHT);
}
if (m & TP_ACPI_HKEY_DISPXPAND_MASK) {
- d = nvram_read_byte(TP_NVRAM_ADDR_VIDEO);
+ d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_VIDEO);
n->displayexp_toggle =
!!(d & TP_NVRAM_MASK_HKT_DISPEXPND);
}
if (m & TP_NVRAM_HKEY_GROUP_BRIGHTNESS) {
- d = nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
+ d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
n->brightness_level = (d & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
>> TP_NVRAM_POS_LEVEL_BRIGHTNESS;
n->brightness_toggle =
!!(d & TP_NVRAM_MASK_HKT_BRIGHTNESS);
}
if (m & TP_NVRAM_HKEY_GROUP_VOLUME) {
- d = nvram_read_byte(TP_NVRAM_ADDR_MIXER);
+ d = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_MIXER);
n->volume_level = (d & TP_NVRAM_MASK_LEVEL_VOLUME)
>> TP_NVRAM_POS_LEVEL_VOLUME;
n->mute = !!(d & TP_NVRAM_MASK_MUTE);
@@ -6156,7 +6156,7 @@ static unsigned int tpacpi_brightness_nv
{
u8 lnvram;
- lnvram = (nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS)
+ lnvram = (arch_nvram_ops.read_byte(TP_NVRAM_ADDR_BRIGHTNESS)
& TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
>> TP_NVRAM_POS_LEVEL_BRIGHTNESS;
lnvram &= bright_maxlvl;
@@ -6181,7 +6181,7 @@ static void tpacpi_brightness_checkpoint
if (unlikely(!acpi_ec_read(TP_EC_BACKLIGHT, &lec)))
goto unlock;
lec &= TP_EC_BACKLIGHT_LVLMSK;
- b_nvram = nvram_read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
+ b_nvram = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_BRIGHTNESS);
if (lec != ((b_nvram & TP_NVRAM_MASK_LEVEL_BRIGHTNESS)
>> TP_NVRAM_POS_LEVEL_BRIGHTNESS)) {
@@ -6189,7 +6189,7 @@ static void tpacpi_brightness_checkpoint
b_nvram &= ~(TP_NVRAM_MASK_LEVEL_BRIGHTNESS <<
TP_NVRAM_POS_LEVEL_BRIGHTNESS);
b_nvram |= lec;
- nvram_write_byte(b_nvram, TP_NVRAM_ADDR_BRIGHTNESS);
+ arch_nvram_ops.write_byte(b_nvram, TP_NVRAM_ADDR_BRIGHTNESS);
dbg_printk(TPACPI_DBG_BRGHT,
"updated NVRAM backlight level to %u (0x%02x)\n",
(unsigned int) lec, (unsigned int) b_nvram);
@@ -6797,13 +6797,13 @@ static void tpacpi_volume_checkpoint_nvr
if (unlikely(!acpi_ec_read(TP_EC_AUDIO, &lec)))
goto unlock;
lec &= ec_mask;
- b_nvram = nvram_read_byte(TP_NVRAM_ADDR_MIXER);
+ b_nvram = arch_nvram_ops.read_byte(TP_NVRAM_ADDR_MIXER);
if (lec != (b_nvram & ec_mask)) {
/* NVRAM needs update */
b_nvram &= ~ec_mask;
b_nvram |= lec;
- nvram_write_byte(b_nvram, TP_NVRAM_ADDR_MIXER);
+ arch_nvram_ops.write_byte(b_nvram, TP_NVRAM_ADDR_MIXER);
dbg_printk(TPACPI_DBG_MIXER,
"updated NVRAM mixer status to 0x%02x (0x%02x)\n",
(unsigned int) lec, (unsigned int) b_nvram);
next prev parent reply other threads:[~2015-07-25 7:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-25 7:45 [RFC v5 00/26] Re-use nvram module Finn Thain
2015-07-25 7:46 ` [RFC v5 01/26] scsi/atari_scsi: Dont select CONFIG_NVRAM Finn Thain
2015-07-25 7:46 ` [RFC v5 02/26] char/nvram: Use bitwise OR to obtain Atari video mode data Finn Thain
2015-07-25 7:46 ` [RFC v5 03/26] m68k/atari: Move Atari-specific code out of drivers/char/nvram.c Finn Thain
2015-07-25 7:46 ` [RFC v5 04/26] m68k/atari: Replace nvram_{read, write}_byte with arch_nvram_ops Finn Thain
2015-07-25 7:46 ` [RFC v5 05/26] char/nvram: Re-order functions to remove forward declarations and #ifdefs Finn Thain
2015-07-25 7:46 ` [RFC v5 06/26] char/nvram: Adopt arch_nvram_ops Finn Thain
2015-07-25 7:46 ` Finn Thain [this message]
2015-07-25 7:46 ` [RFC v5 08/26] char/nvram: Allow the set_checksum and initialize ioctls to be omitted Finn Thain
2015-07-25 7:46 ` [RFC v5 09/26] char/nvram: Implement NVRAM read/write methods Finn Thain
2015-07-25 7:46 ` [RFC v5 10/26] char/nvram: Use generic fixed_size_llseek() Finn Thain
2015-07-25 7:46 ` [RFC v5 11/26] m68k/atari: Implement arch_nvram_ops methods and enable CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-07-25 7:46 ` [RFC v5 12/26] char/nvram: Add "devname:nvram" module alias Finn Thain
2015-07-25 7:46 ` [RFC v5 13/26] powerpc: Cleanup nvram includes Finn Thain
2015-07-25 7:46 ` [RFC v5 14/26] powerpc: Add missing ppc_md.nvram_size for CHRP and PowerMac Finn Thain
2015-07-25 7:46 ` [RFC v5 15/26] powerpc: Implement arch_nvram_ops.get_size() and remove old nvram_* exports Finn Thain
2015-07-25 7:46 ` [RFC v5 16/26] powerpc: Implement nvram sync ioctl Finn Thain
2015-07-25 7:46 ` [RFC v5 17/26] powerpc, fbdev: Use NV_CMODE and NV_VMODE only when CONFIG_PPC32 and CONFIG_PPC_PMAC and CONFIG_NVRAM Finn Thain
2015-07-25 7:46 ` [RFC v5 18/26] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() Finn Thain
2015-07-25 7:46 ` [RFC v5 19/26] nvram: Drop nvram_* symbol exports and prototypes Finn Thain
2015-07-25 7:46 ` [RFC v5 20/26] powerpc: Remove CONFIG_GENERIC_NVRAM and adopt CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-07-25 7:46 ` [RFC v5 21/26] char/generic_nvram: Remove as unused Finn Thain
2015-07-25 7:46 ` [RFC v5 22/26] powerpc: Adopt nvram module for PPC64 Finn Thain
2015-07-25 7:46 ` [RFC v5 23/26] m68k/mac: Adopt naming and calling conventions for PRAM routines Finn Thain
2015-07-25 7:46 ` [RFC v5 24/26] m68k/mac: Use macros for RTC accesses not magic numbers Finn Thain
2015-07-25 7:46 ` [RFC v5 25/26] m68k/mac: Fix PRAM accessors Finn Thain
2015-07-25 7:46 ` [RFC v5 26/26] m68k: Dispatch nvram_ops calls to Atari or Mac functions Finn Thain
2015-08-16 9:15 ` [RFC v5 00/26] Re-use nvram module Geert Uytterhoeven
2015-08-17 8:04 ` Finn Thain
2015-08-17 8:20 ` Geert Uytterhoeven
2015-08-17 8:48 ` Finn Thain
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=20150725074601.243339467@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=dvhart@infradead.org \
--cc=hmh@hmh.eng.br \
--cc=ibm-acpi-devel@lists.sourceforge.net \
--cc=ibm-acpi@hmh.eng.br \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--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;
as well as URLs for NNTP newsgroup(s).