Merge tag 'extcon-next-for-3.20' of... (786f9496) · Commits · 戴 / test

Merge tag 'extcon-next-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next Chanwoo writes: Update extcon for v3.20 This patchset fix minor issue of extcon driver. Detailed description for patchset: - Remove duplicate header file in extcon-class.c and add 'const' keyword for array in extcon-max77693.c. - Release iio channel when executing *_remove() function in extcon-adc-jack.c

drivers/extcon/extcon-adc-jack.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ static int adc_jack_remove(struct platform_device *pdev)

		free_irq(data->irq, data);
		cancel_work_sync(&data->handler.work);
		iio_channel_release(data->chan);

		return 0;
		}

drivers/extcon/extcon-class.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#include <linux/of.h>
		#include <linux/slab.h>
		#include <linux/sysfs.h>
		#include <linux/of.h>

		/*
		* extcon_cable_name suggests the standard cable names for commonly used

drivers/extcon/extcon-max77693.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1033,7 +1033,7 @@ static irqreturn_t max77693_muic_irq_handler(int irq, void *data)
		return IRQ_HANDLED;
		}

		static struct regmap_config max77693_muic_regmap_config = {
		static const struct regmap_config max77693_muic_regmap_config = {
		.reg_bits = 8,
		.val_bits = 8,
		};

Admin message