summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-07-26 13:13:54 -0700
committerStefan Agner <stefan.agner@toradex.com>2016-09-29 13:55:53 -0700
commit65e1bdfe04b1ec61a3a456971ce7f82349886bfd (patch)
treec9c293db380b46b77f56d2d147202890fb49764f
parentdb04bd4ba6637bb20cdb8734dab90613721d978e (diff)
Revert "spi core: Add new sysfs 'num_chipselect' file"
This reverts commit 88c66ffd8ed6cd50e436ce0d5830cd27f93259a2. Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--Documentation/spi/spi-summary3
-rw-r--r--drivers/spi/spi.c23
2 files changed, 0 insertions, 26 deletions
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary
index b4d15e409cfe..d1824b399b2d 100644
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
@@ -181,9 +181,6 @@ shows up in sysfs in several locations:
controller managing bus "B". All spiB.* devices share one
physical SPI bus segment, with SCLK, MOSI, and MISO.
- /sys/class/spi_master/spiB/num_chipselect ... exposes the maximum
- number of chipselects a SPI master can support.
-
Note that the actual location of the controller's class state depends
on whether you enabled CONFIG_SYSFS_DEPRECATED or not. At this time,
the only class-specific state is the bus number ("B" in "spiB"), so
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 06fb3dd1b297..dee1cb87d24f 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -67,19 +67,6 @@ modalias_show(struct device *dev, struct device_attribute *a, char *buf)
}
static DEVICE_ATTR_RO(modalias);
-static ssize_t
-num_chipselect_show(struct device *dev, struct device_attribute *a, char *buf)
-{
- struct spi_master *master = container_of(dev,
- struct spi_master, dev);
-
- return sprintf(buf, "%d\n", master->num_chipselect);
-}
-static struct device_attribute dev_attr_num_chipselect = {
- .attr = { .name = "num_chipselect", .mode = S_IRUGO },
- .show = num_chipselect_show,
-};
-
#define SPI_STATISTICS_ATTRS(field, file) \
static ssize_t spi_master_##field##_show(struct device *dev, \
struct device_attribute *attr, \
@@ -167,15 +154,6 @@ static const struct attribute_group spi_dev_group = {
.attrs = spi_dev_attrs,
};
-static struct attribute *spi_master_attrs[] = {
- &dev_attr_num_chipselect.attr,
- NULL,
-};
-
-static const struct attribute_group spi_master_group = {
- .attrs = spi_master_attrs,
-};
-
static struct attribute *spi_device_statistics_attrs[] = {
&dev_attr_spi_device_messages.attr,
&dev_attr_spi_device_transfers.attr,
@@ -255,7 +233,6 @@ static const struct attribute_group spi_master_statistics_group = {
};
static const struct attribute_group *spi_master_groups[] = {
- &spi_master_group,
&spi_master_statistics_group,
NULL,
};