Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 637704cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux 

Pull i2c __dev* attribute removal from Wolfram Sang:
 "The squashed patches from Bill to get rid of the __dev* annotations in
  the i2c subsystem.  I couldn't include it in my previous pull request
  due to some dependency with the mfd subsystem.  I had this patch in
  linux-next for two days before rc1 and nothing popped up."

* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux:
  i2c: remove __dev* attributes from subsystem
parents 4ae0a48b 0b255e92

drivers/i2c/busses/i2c-ali1535.c

+4 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static unsigned short ali1535_offset; 
   Note the differences between kernels with the old PCI BIOS interface and

   newer kernels with the real PCI interface. In compat.h some things are

   defined to make the transition easier. */

static int __devinit ali1535_setup(struct pci_dev *dev)

static int ali1535_setup(struct pci_dev *dev)

{

	int retval;

	unsigned char temp;
@@ -502,7 +502,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = { 


MODULE_DEVICE_TABLE(pci, ali1535_ids);



static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	if (ali1535_setup(dev)) {

		dev_warn(&dev->dev,
@@ -518,7 +518,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_ 
	return i2c_add_adapter(&ali1535_adapter);

}



static void __devexit ali1535_remove(struct pci_dev *dev)

static void ali1535_remove(struct pci_dev *dev)

{

	i2c_del_adapter(&ali1535_adapter);

	release_region(ali1535_smba, ALI1535_SMB_IOSIZE);
@@ -528,7 +528,7 @@ static struct pci_driver ali1535_driver = { 
	.name		= "ali1535_smbus",

	.id_table	= ali1535_ids,

	.probe		= ali1535_probe,

	.remove		= __devexit_p(ali1535_remove),

	.remove		= ali1535_remove,

};



module_pci_driver(ali1535_driver);

drivers/i2c/busses/i2c-ali1563.c

+5 −5
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static u32 ali1563_func(struct i2c_adapter * a) 
}





static int __devinit ali1563_setup(struct pci_dev * dev)

static int ali1563_setup(struct pci_dev *dev)

{

	u16 ctrl;
@@ -390,7 +390,7 @@ static struct i2c_adapter ali1563_adapter = { 
	.algo	= &ali1563_algorithm,

};



static int __devinit ali1563_probe(struct pci_dev * dev,

static int ali1563_probe(struct pci_dev *dev,

			 const struct pci_device_id *id_table)

{

	int error;
@@ -411,7 +411,7 @@ static int __devinit ali1563_probe(struct pci_dev * dev, 
	return error;

}



static void __devexit ali1563_remove(struct pci_dev * dev)

static void ali1563_remove(struct pci_dev *dev)

{

	i2c_del_adapter(&ali1563_adapter);

	ali1563_shutdown(dev);
@@ -428,7 +428,7 @@ static struct pci_driver ali1563_pci_driver = { 
 	.name		= "ali1563_smbus",

	.id_table	= ali1563_id_table,

 	.probe		= ali1563_probe,

	.remove		= __devexit_p(ali1563_remove),

	.remove		= ali1563_remove,

};



module_pci_driver(ali1563_pci_driver);

drivers/i2c/busses/i2c-ali15x3.c

+4 −4
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ MODULE_PARM_DESC(force_addr, 
static struct pci_driver ali15x3_driver;

static unsigned short ali15x3_smba;



static int __devinit ali15x3_setup(struct pci_dev *ALI15X3_dev)

static int ali15x3_setup(struct pci_dev *ALI15X3_dev)

{

	u16 a;

	unsigned char temp;
@@ -484,7 +484,7 @@ static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = { 


MODULE_DEVICE_TABLE (pci, ali15x3_ids);



static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	if (ali15x3_setup(dev)) {

		dev_err(&dev->dev,
@@ -500,7 +500,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_ 
	return i2c_add_adapter(&ali15x3_adapter);

}



static void __devexit ali15x3_remove(struct pci_dev *dev)

static void ali15x3_remove(struct pci_dev *dev)

{

	i2c_del_adapter(&ali15x3_adapter);

	release_region(ali15x3_smba, ALI15X3_SMB_IOSIZE);
@@ -510,7 +510,7 @@ static struct pci_driver ali15x3_driver = { 
	.name		= "ali15x3_smbus",

	.id_table	= ali15x3_ids,

	.probe		= ali15x3_probe,

	.remove		= __devexit_p(ali15x3_remove),

	.remove		= ali15x3_remove,

};



module_pci_driver(ali15x3_driver);

drivers/i2c/busses/i2c-amd756.c

+3 −4
Original line number Diff line number Diff line
@@ -324,8 +324,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = { 


MODULE_DEVICE_TABLE (pci, amd756_ids);



static int __devinit amd756_probe(struct pci_dev *pdev,

				  const struct pci_device_id *id)

static int amd756_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	int nforce = (id->driver_data == NFORCE);

	int error;
@@ -397,7 +396,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, 
	return error;

}



static void __devexit amd756_remove(struct pci_dev *dev)

static void amd756_remove(struct pci_dev *dev)

{

	i2c_del_adapter(&amd756_smbus);

	release_region(amd756_ioport, SMB_IOSIZE);
@@ -407,7 +406,7 @@ static struct pci_driver amd756_driver = { 
	.name		= "amd756_smbus",

	.id_table	= amd756_ids,

	.probe		= amd756_probe,

	.remove		= __devexit_p(amd756_remove),

	.remove		= amd756_remove,

};



module_pci_driver(amd756_driver);

drivers/i2c/busses/i2c-amd8111.c

+3 −4
Original line number Diff line number Diff line
@@ -422,8 +422,7 @@ static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = { 


MODULE_DEVICE_TABLE (pci, amd8111_ids);



static int __devinit amd8111_probe(struct pci_dev *dev,

		const struct pci_device_id *id)

static int amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	struct amd_smbus *smbus;

	int error;
@@ -475,7 +474,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev, 
	return error;

}



static void __devexit amd8111_remove(struct pci_dev *dev)

static void amd8111_remove(struct pci_dev *dev)

{

	struct amd_smbus *smbus = pci_get_drvdata(dev);
@@ -488,7 +487,7 @@ static struct pci_driver amd8111_driver = { 
	.name		= "amd8111_smbus2",

	.id_table	= amd8111_ids,

	.probe		= amd8111_probe,

	.remove		= __devexit_p(amd8111_remove),

	.remove		= amd8111_remove,

};



module_pci_driver(amd8111_driver);