From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: linux-kernel@vger.kernel.org
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-acpi@vger.kernel.org, devicetree@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Bryan Wu <cooloney@gmail.com>, Lee Jones <lee.jones@linaro.org>,
Grant Likely <grant.likely@linaro.org>,
Arnd Bergmann <arnd@arndb.de>, Aaron Lu <aaron.lu@intel.com>,
Darren Hart <dvhart@linux.intel.com>
Subject: [PATCH v3 14/15] misc: at25: Make use of device property API
Date: Wed, 01 Oct 2014 04:21:18 +0200 [thread overview]
Message-ID: <2074642.sV7QBxD3Ne@vostro.rjw.lan> (raw)
In-Reply-To: <1852462.V1jlbi8OPt@vostro.rjw.lan>
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Make use of device property API in this driver so that both DT and ACPI
based systems can use this driver.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/misc/eeprom/at25.c | 34 +++++++++++++---------------------
1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index 634f72929e12..58f6cdd2551c 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -18,7 +18,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/eeprom.h>
-#include <linux/of.h>
+#include <linux/property.h>
/*
* NOTE: this is an *EEPROM* driver. The vagaries of product naming
@@ -301,35 +301,33 @@ static ssize_t at25_mem_write(struct memory_accessor *mem, const char *buf,
/*-------------------------------------------------------------------------*/
-static int at25_np_to_chip(struct device *dev,
- struct device_node *np,
- struct spi_eeprom *chip)
+static int at25_fw_to_chip(struct device *dev, struct spi_eeprom *chip)
{
u32 val;
memset(chip, 0, sizeof(*chip));
- strncpy(chip->name, np->name, sizeof(chip->name));
+ strncpy(chip->name, "at25", sizeof(chip->name));
- if (of_property_read_u32(np, "size", &val) == 0 ||
- of_property_read_u32(np, "at25,byte-len", &val) == 0) {
+ if (device_property_read_u32(dev, "size", &val) == 0 ||
+ device_property_read_u32(dev, "at25,byte-len", &val) == 0) {
chip->byte_len = val;
} else {
dev_err(dev, "Error: missing \"size\" property\n");
return -ENODEV;
}
- if (of_property_read_u32(np, "pagesize", &val) == 0 ||
- of_property_read_u32(np, "at25,page-size", &val) == 0) {
+ if (device_property_read_u32(dev, "pagesize", &val) == 0 ||
+ device_property_read_u32(dev, "at25,page-size", &val) == 0) {
chip->page_size = (u16)val;
} else {
dev_err(dev, "Error: missing \"pagesize\" property\n");
return -ENODEV;
}
- if (of_property_read_u32(np, "at25,addr-mode", &val) == 0) {
+ if (device_property_read_u32(dev, "at25,addr-mode", &val) == 0) {
chip->flags = (u16)val;
} else {
- if (of_property_read_u32(np, "address-width", &val)) {
+ if (device_property_read_u32(dev, "address-width", &val)) {
dev_err(dev,
"Error: missing \"address-width\" property\n");
return -ENODEV;
@@ -350,7 +348,7 @@ static int at25_np_to_chip(struct device *dev,
val);
return -ENODEV;
}
- if (of_find_property(np, "read-only", NULL))
+ if (!device_get_property(dev, "read-only", NULL))
chip->flags |= EE_READONLY;
}
return 0;
@@ -360,21 +358,15 @@ static int at25_probe(struct spi_device *spi)
{
struct at25_data *at25 = NULL;
struct spi_eeprom chip;
- struct device_node *np = spi->dev.of_node;
int err;
int sr;
int addrlen;
/* Chip description */
if (!spi->dev.platform_data) {
- if (np) {
- err = at25_np_to_chip(&spi->dev, np, &chip);
- if (err)
- return err;
- } else {
- dev_err(&spi->dev, "Error: no chip description\n");
- return -ENODEV;
- }
+ err = at25_fw_to_chip(&spi->dev, &chip);
+ if (err)
+ return err;
} else
chip = *(struct spi_eeprom *)spi->dev.platform_data;
--
1.8.4.5
next prev parent reply other threads:[~2014-10-01 2:03 UTC|newest]
Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-16 11:52 [RFC PATCH v2 00/16] Add ACPI _DSD and unified device properties support Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 01/16] ACPI: Add support for device specific properties Mika Westerberg
2014-10-06 13:50 ` Grant Likely
2014-10-06 14:32 ` Mika Westerberg
2014-10-06 16:25 ` Darren Hart
2014-09-16 11:52 ` [RFC PATCH v2 02/16] Driver core: Unified device properties interface for platform firmware Mika Westerberg
2014-09-17 18:28 ` Greg Kroah-Hartman
2014-09-16 11:52 ` [RFC PATCH v2 03/16] ACPI: Allow drivers to match using Device Tree compatible property Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 04/16] ACPI: Document ACPI device specific properties Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 05/16] mfd: Add ACPI support Mika Westerberg
2014-09-16 21:54 ` Lee Jones
2014-09-24 12:00 ` Lee Jones
2014-09-16 11:52 ` [RFC PATCH v2 06/16] gpio / ACPI: Add support for _DSD device properties Mika Westerberg
2014-09-23 15:27 ` Linus Walleij
2014-09-16 11:52 ` [RFC PATCH v2 07/16] gpio: Add support for unified device properties interface Mika Westerberg
2014-09-23 15:25 ` Linus Walleij
2014-09-23 15:45 ` Arnd Bergmann
2014-09-23 15:52 ` Mika Westerberg
2014-09-23 16:17 ` Dmitry Torokhov
2014-09-23 20:31 ` Rafael J. Wysocki
2014-09-23 16:25 ` Rafael J. Wysocki
2014-09-23 16:26 ` Arnd Bergmann
2014-09-23 20:47 ` Rafael J. Wysocki
2014-09-24 7:55 ` Arnd Bergmann
2014-09-24 14:08 ` Rafael J. Wysocki
2014-09-23 21:15 ` Darren Hart
2014-09-24 9:12 ` Arnd Bergmann
2014-09-24 9:38 ` Mika Westerberg
2014-09-24 14:11 ` Rafael J. Wysocki
2014-09-26 3:21 ` Darren Hart
2014-09-26 8:36 ` Arnd Bergmann
2014-09-26 14:42 ` Rafael J. Wysocki
2014-10-07 13:37 ` Linus Walleij
2014-10-07 15:37 ` Andy Shevchenko
2014-10-07 23:57 ` Rafael J. Wysocki
2014-09-16 11:52 ` [RFC PATCH v2 08/16] gpio: sch: Consolidate core and resume banks Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 09/16] leds: leds-gpio: Add support for GPIO descriptors Mika Westerberg
2014-09-19 8:18 ` Alexandre Courbot
2014-09-24 7:55 ` Linus Walleij
2014-09-24 9:42 ` Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 10/16] leds: leds-gpio: Make use of device property API Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 11/16] leds: leds-gpio: Add ACPI probing support Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 12/16] input: gpio_keys_polled - Add support for GPIO descriptors Mika Westerberg
2014-09-19 8:22 ` Alexandre Courbot
2014-09-24 8:02 ` Linus Walleij
2014-09-16 11:52 ` [RFC PATCH v2 13/16] input: gpio_keys_polled - Make use of device property API Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 14/16] input: gpio_keys_polled - Add ACPI probing support Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 15/16] misc: at25: Make use of device property API Mika Westerberg
2014-09-16 11:52 ` [RFC PATCH v2 16/16] misc: at25: Add ACPI probing support Mika Westerberg
2014-09-21 0:26 ` [RFC PATCH v2 00/16] Add ACPI _DSD and unified device properties support Rafael J. Wysocki
2014-09-24 8:34 ` Lee Jones
2014-09-24 9:45 ` Mika Westerberg
2014-09-22 23:29 ` Bryan Wu
2014-10-01 2:08 ` [PATCH v3 00/15] " Rafael J. Wysocki
2014-10-01 2:08 ` [PATCH v3 01/15] ACPI: Add support for device specific properties Rafael J. Wysocki
2014-10-01 7:38 ` Arnd Bergmann
2014-10-01 2:10 ` [PATCH v3 02/15] Driver core: Unified device properties interface for platform firmware Rafael J. Wysocki
2014-10-01 7:47 ` Arnd Bergmann
2014-10-01 22:09 ` Rafael J. Wysocki
2014-10-01 23:01 ` Rafael J. Wysocki
2014-10-02 7:46 ` Arnd Bergmann
2014-10-02 16:50 ` Rafael J. Wysocki
2014-10-02 0:03 ` Greg Kroah-Hartman
2014-10-01 2:10 ` [PATCH v3 03/15] ACPI: Allow drivers to match using Device Tree compatible property Rafael J. Wysocki
2014-10-01 7:48 ` Arnd Bergmann
2014-10-03 13:43 ` Mark Rutland
2014-10-03 17:59 ` Dmitry Torokhov
2014-10-04 0:02 ` Rafael J. Wysocki
2014-10-01 2:11 ` [PATCH v3 04/15] ACPI: Document ACPI device specific properties Rafael J. Wysocki
2014-10-01 7:59 ` Arnd Bergmann
2014-10-02 10:41 ` Mika Westerberg
2014-10-02 11:51 ` Arnd Bergmann
2014-10-02 12:15 ` Mika Westerberg
2014-10-02 12:46 ` Arnd Bergmann
2014-10-02 13:36 ` Mika Westerberg
2014-10-02 14:29 ` Arnd Bergmann
2014-10-02 14:38 ` Mika Westerberg
2014-10-02 14:55 ` Arnd Bergmann
2014-10-03 13:56 ` Mark Rutland
2014-10-03 15:02 ` Arnd Bergmann
2014-10-03 23:58 ` Rafael J. Wysocki
2014-10-04 10:56 ` Arnd Bergmann
2014-10-05 21:40 ` Rafael J. Wysocki
2014-10-03 2:03 ` Rafael J. Wysocki
2014-10-03 8:12 ` Mika Westerberg
2014-10-03 13:58 ` Mark Rutland
2014-10-03 14:38 ` Rafael J. Wysocki
2014-10-03 14:35 ` Mark Rutland
2014-10-04 0:13 ` Rafael J. Wysocki
2014-10-04 10:59 ` Arnd Bergmann
2014-10-05 22:26 ` Rafael J. Wysocki
2014-10-03 13:48 ` Mark Rutland
2014-10-04 0:16 ` Rafael J. Wysocki
2014-10-01 2:12 ` [PATCH v3 05/15] gpio / ACPI: Add support for _DSD device properties Rafael J. Wysocki
2014-10-01 8:03 ` Arnd Bergmann
2014-10-05 10:36 ` Alexandre Courbot
2014-10-05 21:20 ` Rafael J. Wysocki
2014-10-01 2:14 ` [PATCH v3 06/15] gpio: Support for unified device properties interface Rafael J. Wysocki
2014-10-01 2:15 ` [PATCH v3 07/15] gpio: sch: Consolidate core and resume banks Rafael J. Wysocki
2014-10-01 2:15 ` [PATCH v3 08/15] leds: leds-gpio: Add support for GPIO descriptors Rafael J. Wysocki
2014-10-01 8:05 ` Arnd Bergmann
2014-10-01 2:16 ` [PATCH v3 09/15] leds: leds-gpio: Make use of device property API Rafael J. Wysocki
2014-10-03 14:07 ` Mark Rutland
2014-10-04 0:18 ` Rafael J. Wysocki
2014-10-01 2:17 ` [PATCH v3 10/15] leds: leds-gpio: Add ACPI probing support Rafael J. Wysocki
2014-10-01 8:13 ` Arnd Bergmann
2014-10-01 9:13 ` Mika Westerberg
2014-10-01 10:01 ` Arnd Bergmann
2014-10-01 11:59 ` Mika Westerberg
2014-10-01 13:52 ` Arnd Bergmann
2014-10-01 14:04 ` Mika Westerberg
2014-10-01 14:14 ` Arnd Bergmann
2014-10-02 9:55 ` Mika Westerberg
2014-10-02 10:44 ` Arnd Bergmann
2014-10-01 16:30 ` Dmitry Torokhov
2014-10-01 18:11 ` Darren Hart
2014-10-01 18:21 ` Dmitry Torokhov
2014-10-01 18:22 ` Arnd Bergmann
2014-10-01 2:17 ` [PATCH v3 11/15] input: gpio_keys_polled - Add support for GPIO descriptors Rafael J. Wysocki
2014-10-01 8:13 ` Arnd Bergmann
2014-10-01 2:20 ` [PATCH v3 12/15] input: gpio_keys_polled - Make use of device property API Rafael J. Wysocki
2014-10-01 2:20 ` [PATCH v3 13/15] input: gpio_keys_polled - Add ACPI probing support Rafael J. Wysocki
2014-10-01 7:48 ` Dmitry Torokhov
2014-10-01 9:15 ` Mika Westerberg
2014-10-01 16:28 ` Dmitry Torokhov
2014-10-02 9:53 ` Mika Westerberg
2014-10-01 2:21 ` Rafael J. Wysocki [this message]
2014-10-01 8:14 ` [PATCH v3 14/15] misc: at25: Make use of device property API Arnd Bergmann
2014-10-01 2:22 ` [PATCH v3 15/15] misc: at25: Add ACPI probing support Rafael J. Wysocki
2014-10-01 8:15 ` Arnd Bergmann
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=2074642.sV7QBxD3Ne@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=aaron.lu@intel.com \
--cc=arnd@arndb.de \
--cc=cooloney@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dvhart@linux.intel.com \
--cc=gnurou@gmail.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
/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).