Commit b5909c6d authored by Jerry Lin's avatar Jerry Lin Committed by Greg Kroah-Hartman
Browse files

staging: kpc2000: rename variables with kpc namespace 



Some namings in kpc2000_i2c are too ambiguous that may causing
confusion to the readers.

Rename some variable, function and struct name to prefix with 'kpc_i2c'
to eliminate confusions.

Signed-off-by: default avatarJerry Lin <wahahab11@gmail.com>
Link: https://lore.kernel.org/r/20200121024620.GA10842@compute1


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 747a64bd

drivers/staging/kpc2000/kpc2000_i2c.c

+20 −20
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
MODULE_LICENSE("GPL");

MODULE_AUTHOR("Matt.Sickler@Daktronics.com");



struct i2c_device {

struct kpc_i2c {

	unsigned long           smba;

	struct i2c_adapter      adapter;

	unsigned int            features;
@@ -131,7 +131,7 @@ struct i2c_device { 
/* Make sure the SMBus host is ready to start transmitting.

 * Return 0 if it is, -EBUSY if it is not.

 */

static int i801_check_pre(struct i2c_device *priv)

static int i801_check_pre(struct kpc_i2c *priv)

{

	int status;
@@ -156,7 +156,7 @@ static int i801_check_pre(struct i2c_device *priv) 
}



/* Convert the status register to an error code, and clear it. */

static int i801_check_post(struct i2c_device *priv, int status, int timeout)

static int i801_check_post(struct kpc_i2c *priv, int status, int timeout)

{

	int result = 0;
@@ -206,7 +206,7 @@ static int i801_check_post(struct i2c_device *priv, int status, int timeout) 
	return result;

}



static int i801_transaction(struct i2c_device *priv, int xact)

static int i801_transaction(struct kpc_i2c *priv, int xact)

{

	int status;

	int result;
@@ -235,7 +235,7 @@ static int i801_transaction(struct i2c_device *priv, int xact) 
}



/* wait for INTR bit as advised by Intel */

static void i801_wait_hwpec(struct i2c_device *priv)

static void i801_wait_hwpec(struct kpc_i2c *priv)

{

	int timeout = 0;

	int status;
@@ -251,7 +251,7 @@ static void i801_wait_hwpec(struct i2c_device *priv) 
	outb_p(status, SMBHSTSTS(priv));

}



static int i801_block_transaction_by_block(struct i2c_device *priv,

static int i801_block_transaction_by_block(struct kpc_i2c *priv,

					   union i2c_smbus_data *data,

					   char read_write, int hwpec)

{
@@ -285,7 +285,7 @@ static int i801_block_transaction_by_block(struct i2c_device *priv, 
	return 0;

}



static int i801_block_transaction_byte_by_byte(struct i2c_device *priv,

static int i801_block_transaction_byte_by_byte(struct kpc_i2c *priv,

					       union i2c_smbus_data *data,

					       char read_write, int command,

					       int hwpec)
@@ -367,7 +367,7 @@ static int i801_block_transaction_byte_by_byte(struct i2c_device *priv, 
	return 0;

}



static int i801_set_block_buffer_mode(struct i2c_device *priv)

static int i801_set_block_buffer_mode(struct kpc_i2c *priv)

{

	outb_p(inb_p(SMBAUXCTL(priv)) | SMBAUXCTL_E32B, SMBAUXCTL(priv));

	if ((inb_p(SMBAUXCTL(priv)) & SMBAUXCTL_E32B) == 0)
@@ -376,7 +376,7 @@ static int i801_set_block_buffer_mode(struct i2c_device *priv) 
}



/* Block transaction function */

static int i801_block_transaction(struct i2c_device *priv,

static int i801_block_transaction(struct kpc_i2c *priv,

				  union i2c_smbus_data *data, char read_write,

				  int command, int hwpec)

{
@@ -440,7 +440,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, 
	int hwpec;

	int block = 0;

	int ret, xact = 0;

	struct i2c_device *priv = i2c_get_adapdata(adap);

	struct kpc_i2c *priv = i2c_get_adapdata(adap);



	hwpec = (priv->features & FEATURE_SMBUS_PEC) &&

		(flags & I2C_CLIENT_PEC) &&
@@ -578,7 +578,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, 


static u32 i801_func(struct i2c_adapter *adapter)

{

	struct i2c_device *priv = i2c_get_adapdata(adapter);

	struct kpc_i2c *priv = i2c_get_adapdata(adapter);



	/* original settings

	 * u32 f = I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
@@ -648,10 +648,10 @@ static const struct i2c_algorithm smbus_algorithm = { 
/********************************

 *** Part 2 - Driver Handlers ***

 ********************************/

static int pi2c_probe(struct platform_device *pldev)

static int kpc_i2c_probe(struct platform_device *pldev)

{

	int err;

	struct i2c_device *priv;

	struct kpc_i2c *priv;

	struct resource *res;



	priv = devm_kzalloc(&pldev->dev, sizeof(*priv), GFP_KERNEL);
@@ -700,11 +700,11 @@ static int pi2c_probe(struct platform_device *pldev) 
	return 0;

}



static int pi2c_remove(struct platform_device *pldev)

static int kpc_i2c_remove(struct platform_device *pldev)

{

	struct i2c_device *lddev;

	struct kpc_i2c *lddev;



	lddev = (struct i2c_device *)platform_get_drvdata(pldev);

	lddev = (struct kpc_i2c *)platform_get_drvdata(pldev);



	i2c_del_adapter(&lddev->adapter);
@@ -718,12 +718,12 @@ static int pi2c_remove(struct platform_device *pldev) 
	return 0;

}



static struct platform_driver i2c_plat_driver_i = {

	.probe      = pi2c_probe,

	.remove     = pi2c_remove,

static struct platform_driver kpc_i2c_driver = {

	.probe      = kpc_i2c_probe,

	.remove     = kpc_i2c_remove,

	.driver     = {

		.name   = KP_DRIVER_NAME_I2C,

	},

};



module_platform_driver(i2c_plat_driver_i);
 
module_platform_driver(kpc_i2c_driver);

CRA Git | Maintained and supported by SUSTech CRA and CCSE