Commit 21a2cb56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

* 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  isl29020: Remove a redundant semi-colon from return statement
  BMP085: Remove redundant semi-colon from return statement
  drivers:misc: ti-st: DEBUG uart, baud rate mods
  drivers:misc: ti-st: flush UART upon fw failure
  drivers:misc: ti-st: protect registrations
  char_dev.c: fix up some whitespace errors
  s390: tape_class.h: remove kobj_map.h inclusion
  misc: ad525x_dpot: Add support for SPI module device table matching
parents c99516ca 2a5ac6f7

drivers/misc/ad525x_dpot-i2c.c

+2 −8
Original line number Diff line number Diff line 
/*

 * Driver for the Analog Devices digital potentiometers (I2C bus)

 *

 * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc.

 * Copyright (C) 2010-2011 Michael Hennerich, Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later.

 */
@@ -11,7 +11,6 @@ 


#include "ad525x_dpot.h"



/* ------------------------------------------------------------------------- */

/* I2C bus functions */

static int write_d8(void *client, u8 val)

{
@@ -60,18 +59,13 @@ static int __devinit ad_dpot_i2c_probe(struct i2c_client *client, 
		.bops = &bops,

	};



	struct ad_dpot_id dpot_id = {

		.name = (char *) &id->name,

		.devid = id->driver_data,

	};



	if (!i2c_check_functionality(client->adapter,

				     I2C_FUNC_SMBUS_WORD_DATA)) {

		dev_err(&client->dev, "SMBUS Word Data not Supported\n");

		return -EIO;

	}



	return ad_dpot_probe(&client->dev, &bdata, &dpot_id);

	return ad_dpot_probe(&client->dev, &bdata, id->driver_data, id->name);

}



static int __devexit ad_dpot_i2c_remove(struct i2c_client *client)

drivers/misc/ad525x_dpot-spi.c

+38 −59
Original line number Diff line number Diff line 
/*

 * Driver for the Analog Devices digital potentiometers (SPI bus)

 *

 * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc.

 * Copyright (C) 2010-2011 Michael Hennerich, Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later.

 */
@@ -11,40 +11,6 @@ 


#include "ad525x_dpot.h"



static const struct ad_dpot_id ad_dpot_spi_devlist[] = {

	{.name = "ad5160", .devid = AD5160_ID},

	{.name = "ad5161", .devid = AD5161_ID},

	{.name = "ad5162", .devid = AD5162_ID},

	{.name = "ad5165", .devid = AD5165_ID},

	{.name = "ad5200", .devid = AD5200_ID},

	{.name = "ad5201", .devid = AD5201_ID},

	{.name = "ad5203", .devid = AD5203_ID},

	{.name = "ad5204", .devid = AD5204_ID},

	{.name = "ad5206", .devid = AD5206_ID},

	{.name = "ad5207", .devid = AD5207_ID},

	{.name = "ad5231", .devid = AD5231_ID},

	{.name = "ad5232", .devid = AD5232_ID},

	{.name = "ad5233", .devid = AD5233_ID},

	{.name = "ad5235", .devid = AD5235_ID},

	{.name = "ad5260", .devid = AD5260_ID},

	{.name = "ad5262", .devid = AD5262_ID},

	{.name = "ad5263", .devid = AD5263_ID},

	{.name = "ad5290", .devid = AD5290_ID},

	{.name = "ad5291", .devid = AD5291_ID},

	{.name = "ad5292", .devid = AD5292_ID},

	{.name = "ad5293", .devid = AD5293_ID},

	{.name = "ad7376", .devid = AD7376_ID},

	{.name = "ad8400", .devid = AD8400_ID},

	{.name = "ad8402", .devid = AD8402_ID},

	{.name = "ad8403", .devid = AD8403_ID},

	{.name = "adn2850", .devid = ADN2850_ID},

	{.name = "ad5270", .devid = AD5270_ID},

	{.name = "ad5271", .devid = AD5271_ID},

	{}

};



/* ------------------------------------------------------------------------- */



/* SPI bus functions */

static int write8(void *client, u8 val)

{
@@ -109,36 +75,16 @@ static const struct ad_dpot_bus_ops bops = { 
	.write_r8d8	= write16,

	.write_r8d16	= write24,

};



static const struct ad_dpot_id *dpot_match_id(const struct ad_dpot_id *id,

						char *name)

{

	while (id->name && id->name[0]) {

		if (strcmp(name, id->name) == 0)

			return id;

		id++;

	}

	return NULL;

}



static int __devinit ad_dpot_spi_probe(struct spi_device *spi)

{

	char *name = spi->dev.platform_data;

	const struct ad_dpot_id *dpot_id;



	struct ad_dpot_bus_data bdata = {

		.client = spi,

		.bops = &bops,

	};



	dpot_id = dpot_match_id(ad_dpot_spi_devlist, name);



	if (dpot_id == NULL) {

		dev_err(&spi->dev, "%s not in supported device list", name);

		return -ENODEV;

	}



	return ad_dpot_probe(&spi->dev, &bdata, dpot_id);

	return ad_dpot_probe(&spi->dev, &bdata,

			     spi_get_device_id(spi)->driver_data,

			     spi_get_device_id(spi)->name);

}



static int __devexit ad_dpot_spi_remove(struct spi_device *spi)
@@ -146,14 +92,47 @@ static int __devexit ad_dpot_spi_remove(struct spi_device *spi) 
	return ad_dpot_remove(&spi->dev);

}



static const struct spi_device_id ad_dpot_spi_id[] = {

	{"ad5160", AD5160_ID},

	{"ad5161", AD5161_ID},

	{"ad5162", AD5162_ID},

	{"ad5165", AD5165_ID},

	{"ad5200", AD5200_ID},

	{"ad5201", AD5201_ID},

	{"ad5203", AD5203_ID},

	{"ad5204", AD5204_ID},

	{"ad5206", AD5206_ID},

	{"ad5207", AD5207_ID},

	{"ad5231", AD5231_ID},

	{"ad5232", AD5232_ID},

	{"ad5233", AD5233_ID},

	{"ad5235", AD5235_ID},

	{"ad5260", AD5260_ID},

	{"ad5262", AD5262_ID},

	{"ad5263", AD5263_ID},

	{"ad5290", AD5290_ID},

	{"ad5291", AD5291_ID},

	{"ad5292", AD5292_ID},

	{"ad5293", AD5293_ID},

	{"ad7376", AD7376_ID},

	{"ad8400", AD8400_ID},

	{"ad8402", AD8402_ID},

	{"ad8403", AD8403_ID},

	{"adn2850", ADN2850_ID},

	{"ad5270", AD5270_ID},

	{"ad5271", AD5271_ID},

	{}

};

MODULE_DEVICE_TABLE(spi, ad_dpot_spi_id);



static struct spi_driver ad_dpot_spi_driver = {

	.driver = {

		.name	= "ad_dpot",

		.bus	= &spi_bus_type,

		.owner	= THIS_MODULE,

	},

	.probe		= ad_dpot_spi_probe,

	.remove		= __devexit_p(ad_dpot_spi_remove),

	.id_table	= ad_dpot_spi_id,

};



static int __init ad_dpot_spi_init(void)

drivers/misc/ad525x_dpot.c

+11 −13
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
 * Author: Chris Verges <chrisv@cyberswitching.com>

 *

 * derived from ad5252.c

 * Copyright (c) 2006 Michael Hennerich <hennerich@blackfin.uclinux.org>

 * Copyright (c) 2006-2011 Michael Hennerich <hennerich@blackfin.uclinux.org>

 *

 * Licensed under the GPL-2 or later.

 */
@@ -76,8 +76,6 @@ 
#include <linux/delay.h>

#include <linux/slab.h>



#define DRIVER_VERSION			"0.2"



#include "ad525x_dpot.h"



/*
@@ -687,8 +685,9 @@ inline void ad_dpot_remove_files(struct device *dev, 
	}

}



__devinit int ad_dpot_probe(struct device *dev,

		struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id)

int __devinit ad_dpot_probe(struct device *dev,

		struct ad_dpot_bus_data *bdata, unsigned long devid,

			    const char *name)

{



	struct dpot_data *data;
@@ -704,13 +703,13 @@ __devinit int ad_dpot_probe(struct device *dev, 
	mutex_init(&data->update_lock);



	data->bdata = *bdata;

	data->devid = id->devid;

	data->devid = devid;



	data->max_pos = 1 << DPOT_MAX_POS(data->devid);

	data->max_pos = 1 << DPOT_MAX_POS(devid);

	data->rdac_mask = data->max_pos - 1;

	data->feat = DPOT_FEAT(data->devid);

	data->uid = DPOT_UID(data->devid);

	data->wipers = DPOT_WIPERS(data->devid);

	data->feat = DPOT_FEAT(devid);

	data->uid = DPOT_UID(devid);

	data->wipers = DPOT_WIPERS(devid);



	for (i = DPOT_RDAC0; i < MAX_RDACS; i++)

		if (data->wipers & (1 << i)) {
@@ -731,7 +730,7 @@ __devinit int ad_dpot_probe(struct device *dev, 
	}



	dev_info(dev, "%s %d-Position Digital Potentiometer registered\n",

		 id->name, data->max_pos);

		 name, data->max_pos);



	return 0;
@@ -745,7 +744,7 @@ exit_free: 
	dev_set_drvdata(dev, NULL);

exit:

	dev_err(dev, "failed to create client for %s ID 0x%lX\n",

			id->name, id->devid);

		name, devid);

	return err;

}

EXPORT_SYMBOL(ad_dpot_probe);
@@ -770,4 +769,3 @@ MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>, " 
	      "Michael Hennerich <hennerich@blackfin.uclinux.org>");

MODULE_DESCRIPTION("Digital potentiometer driver");

MODULE_LICENSE("GPL");
 
MODULE_VERSION(DRIVER_VERSION);

drivers/misc/ad525x_dpot.h

+2 −6
Original line number Diff line number Diff line
@@ -208,12 +208,8 @@ struct ad_dpot_bus_data { 
	const struct ad_dpot_bus_ops *bops;

};



struct ad_dpot_id {

	char *name;

	unsigned long devid;

};



int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id);

int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata,

		  unsigned long devid, const char *name);

int ad_dpot_remove(struct device *dev);



#endif

drivers/misc/bmp085.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static s32 bmp085_get_temperature(struct bmp085_data *data, int *temperature) 
		*temperature = (x1+x2+8) >> 4;



exit:

	return status;;

	return status;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE