hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: rfkill: gpio: remove rfkill_gpio_platform_data 

No more users for it.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Heikki Krogerus 2016-01-25 12:03:49 +03:00 committed by Johannes Berg
parent d54bbaf45a
commit fb2e6b7b7b
3 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/linux/rfkill-gpio.h
View File

@ -1,37 +0,0 @@
/*
* Copyright (c) 2011, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __RFKILL_GPIO_H
#define __RFKILL_GPIO_H
#include <linux/types.h>
#include <linux/rfkill.h>
/**
* struct rfkill_gpio_platform_data - platform data for rfkill gpio device.
* for unused gpio's, the expected value is -1.
* @name: name for the gpio rf kill instance
*/
struct rfkill_gpio_platform_data {
char *name;
enum rfkill_type type;
};
#endif /* __RFKILL_GPIO_H */

3
net/rfkill/Kconfig
View File

@ -41,5 +41,4 @@ config RFKILL_GPIO
default n default n
help help
If you say yes here you get support of a generic gpio RFKILL If you say yes here you get support of a generic gpio RFKILL
driver. The platform should fill in the appropriate fields in the driver.
rfkill_gpio_platform_data structure and pass that to the driver.

8
net/rfkill/rfkill-gpio.c
View File

@ -27,8 +27,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/rfkill-gpio.h>
struct rfkill_gpio_data { struct rfkill_gpio_data {
const char *name; const char *name;
enum rfkill_type type; enum rfkill_type type;
@ -89,7 +87,6 @@ static int rfkill_gpio_acpi_probe(struct device *dev,
static int rfkill_gpio_probe(struct platform_device *pdev) static int rfkill_gpio_probe(struct platform_device *pdev)
{ {
struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
struct rfkill_gpio_data *rfkill; struct rfkill_gpio_data *rfkill;
struct gpio_desc *gpio; struct gpio_desc *gpio;
const char *type_name; const char *type_name;
@ -111,11 +108,6 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
ret = rfkill_gpio_acpi_probe(&pdev->dev, rfkill); ret = rfkill_gpio_acpi_probe(&pdev->dev, rfkill);
if (ret) if (ret)
return ret; return ret;
} else if (pdata) {
rfkill->name = pdata->name;
rfkill->type = pdata->type;
} else {
return -ENODEV;
} }
rfkill->clk = devm_clk_get(&pdev->dev, NULL); rfkill->clk = devm_clk_get(&pdev->dev, NULL);