extcon: gpio: Fix minor coding style and remove the unused fields. (6ba12997) · Commits · 戴 / test

drivers/extcon/extcon-gpio.c

+4 −7

Original line number	Diff line number	Diff line
		/*
		* drivers/extcon/extcon_gpio.c
		*
		* Single-state GPIO extcon driver based on extcon class
		* extcon_gpio.c - Single-state GPIO extcon driver based on extcon class
		*
		* Copyright (C) 2008 Google, Inc.
		* Author: Mike Lockwood <lockwood@android.com>
		@@ -17,7 +15,6 @@
		* 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.
		*
		*/

		#include <linux/extcon.h>
		@@ -37,7 +34,7 @@ struct gpio_extcon_data {
		struct delayed_work work;
		unsigned long debounce_jiffies;

		struct gpio_extcon_platform_data *pdata;
		struct gpio_extcon_pdata *pdata;
		};

		static void gpio_extcon_work(struct work_struct *work)
		@@ -64,7 +61,7 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)

		static int gpio_extcon_probe(struct platform_device *pdev)
		{
		struct gpio_extcon_platform_data *pdata = dev_get_platdata(&pdev->dev);
		struct gpio_extcon_pdata *pdata = dev_get_platdata(&pdev->dev);
		struct gpio_extcon_data *data;
		int ret;

include/linux/extcon/extcon-gpio.h

+4 −18

Original line number	Diff line number	Diff line
		/*
		* External connector (extcon) class generic GPIO driver
		* Single-state GPIO extcon driver based on extcon class
		*
		* Copyright (C) 2012 Samsung Electronics
		* Author: MyungJoo Ham <myungjoo.ham@samsung.com>
		@@ -16,7 +16,6 @@
		* 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.
		*
		*/
		#ifndef __EXTCON_GPIO_H__
		#define __EXTCON_GPIO_H__ __FILE__
		@@ -24,8 +23,7 @@
		#include <linux/extcon.h>

		/**
		* struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device.
		* @name: The name of this GPIO extcon device.
		* struct gpio_extcon_pdata - A simple GPIO-controlled extcon device.
		* @extcon_id: The unique id of specific external connector.
		* @gpio: Corresponding GPIO.
		* @gpio_active_low: Boolean describing whether gpio active state is 1 or 0
		@@ -33,28 +31,16 @@
		* If false, high state of gpio means active.
		* @debounce: Debounce time for GPIO IRQ in ms.
		* @irq_flags: IRQ Flags (e.g., IRQF_TRIGGER_LOW).
		* @state_on: print_state is overriden with state_on if attached.
		* If NULL, default method of extcon class is used.
		* @state_off: print_state is overriden with state_off if detached.
		* If NUll, default method of extcon class is used.
		* @check_on_resume: Boolean describing whether to check the state of gpio
		* while resuming from sleep.
		*
		* Note that in order for state_on or state_off to be valid, both state_on
		* and state_off should be not NULL. If at least one of them is NULL,
		* the print_state is not overriden.
		*/
		struct gpio_extcon_platform_data {
		const char *name;
		struct gpio_extcon_pdata {
		unsigned int extcon_id;
		unsigned gpio;
		bool gpio_active_low;
		unsigned long debounce;
		unsigned long irq_flags;

		/* if NULL, "0" or "1" will be printed */
		const char *state_on;
		const char *state_off;
		bool check_on_resume;
		};

Admin message