Commit d364ab90 authored by Hirofumi Ogawa's avatar Hirofumi Ogawa Committed by Greg Kroah-Hartman

[PATCH] DEVICE_NAME_SIZE/_HALF removal (I2C stuff)

parent 0c112ee5
...@@ -507,7 +507,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_ ...@@ -507,7 +507,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_
/* set up the driverfs linkage to our parent device */ /* set up the driverfs linkage to our parent device */
ali1535_adapter.dev.parent = &dev->dev; ali1535_adapter.dev.parent = &dev->dev;
snprintf(ali1535_adapter.name, DEVICE_NAME_SIZE, snprintf(ali1535_adapter.name, I2C_NAME_SIZE,
"SMBus ALI1535 adapter at %04x", ali1535_smba); "SMBus ALI1535 adapter at %04x", ali1535_smba);
return i2c_add_adapter(&ali1535_adapter); return i2c_add_adapter(&ali1535_adapter);
} }
......
...@@ -498,7 +498,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_ ...@@ -498,7 +498,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_
/* set up the driverfs linkage to our parent device */ /* set up the driverfs linkage to our parent device */
ali15x3_adapter.dev.parent = &dev->dev; ali15x3_adapter.dev.parent = &dev->dev;
snprintf(ali15x3_adapter.name, DEVICE_NAME_SIZE, snprintf(ali15x3_adapter.name, I2C_NAME_SIZE,
"SMBus ALI15X3 adapter at %04x", ali15x3_smba); "SMBus ALI15X3 adapter at %04x", ali15x3_smba);
return i2c_add_adapter(&ali15x3_adapter); return i2c_add_adapter(&ali15x3_adapter);
} }
......
...@@ -369,7 +369,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, ...@@ -369,7 +369,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
/* set up the driverfs linkage to our parent device */ /* set up the driverfs linkage to our parent device */
amd756_adapter.dev.parent = &pdev->dev; amd756_adapter.dev.parent = &pdev->dev;
snprintf(amd756_adapter.name, DEVICE_NAME_SIZE, snprintf(amd756_adapter.name, I2C_NAME_SIZE,
"SMBus AMD75x adapter at %04x", amd756_ioport); "SMBus AMD75x adapter at %04x", amd756_ioport);
error = i2c_add_adapter(&amd756_adapter); error = i2c_add_adapter(&amd756_adapter);
......
...@@ -356,7 +356,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_ ...@@ -356,7 +356,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_
goto out_kfree; goto out_kfree;
smbus->adapter.owner = THIS_MODULE; smbus->adapter.owner = THIS_MODULE;
snprintf(smbus->adapter.name, DEVICE_NAME_SIZE, snprintf(smbus->adapter.name, I2C_NAME_SIZE,
"SMBus2 AMD8111 adapter at %04x", smbus->base); "SMBus2 AMD8111 adapter at %04x", smbus->base);
smbus->adapter.id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_AMD8111; smbus->adapter.id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_AMD8111;
smbus->adapter.class = I2C_ADAP_CLASS_SMBUS; smbus->adapter.class = I2C_ADAP_CLASS_SMBUS;
......
...@@ -598,7 +598,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id ...@@ -598,7 +598,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
/* set up the driverfs linkage to our parent device */ /* set up the driverfs linkage to our parent device */
i801_adapter.dev.parent = &dev->dev; i801_adapter.dev.parent = &dev->dev;
snprintf(i801_adapter.name, DEVICE_NAME_SIZE, snprintf(i801_adapter.name, I2C_NAME_SIZE,
"SMBus I801 adapter at %04x", i801_smba); "SMBus I801 adapter at %04x", i801_smba);
return i2c_add_adapter(&i801_adapter); return i2c_add_adapter(&i801_adapter);
} }
......
...@@ -321,7 +321,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int reg, ...@@ -321,7 +321,7 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int reg,
smbus->adapter = nforce2_adapter; smbus->adapter = nforce2_adapter;
smbus->adapter.algo_data = smbus; smbus->adapter.algo_data = smbus;
smbus->adapter.dev.parent = &dev->dev; smbus->adapter.dev.parent = &dev->dev;
snprintf(smbus->adapter.name, DEVICE_NAME_SIZE, snprintf(smbus->adapter.name, I2C_NAME_SIZE,
"SMBus nForce2 adapter at %04x", smbus->base); "SMBus nForce2 adapter at %04x", smbus->base);
error = i2c_add_adapter(&smbus->adapter); error = i2c_add_adapter(&smbus->adapter);
......
...@@ -451,7 +451,7 @@ static int __devinit piix4_probe(struct pci_dev *dev, const struct pci_device_id ...@@ -451,7 +451,7 @@ static int __devinit piix4_probe(struct pci_dev *dev, const struct pci_device_id
/* set up the driverfs linkage to our parent device */ /* set up the driverfs linkage to our parent device */
piix4_adapter.dev.parent = &dev->dev; piix4_adapter.dev.parent = &dev->dev;
snprintf(piix4_adapter.name, DEVICE_NAME_SIZE, snprintf(piix4_adapter.name, I2C_NAME_SIZE,
"SMBus PIIX4 adapter at %04x", piix4_smba); "SMBus PIIX4 adapter at %04x", piix4_smba);
retval = i2c_add_adapter(&piix4_adapter); retval = i2c_add_adapter(&piix4_adapter);
......
...@@ -318,7 +318,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev, ...@@ -318,7 +318,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev,
/* set up the driverfs linkage to our parent device */ /* set up the driverfs linkage to our parent device */
sis96x_adapter.dev.parent = &dev->dev; sis96x_adapter.dev.parent = &dev->dev;
snprintf(sis96x_adapter.name, DEVICE_NAME_SIZE, snprintf(sis96x_adapter.name, I2C_NAME_SIZE,
"SiS96x SMBus adapter at 0x%04x", sis96x_smbus_base); "SiS96x SMBus adapter at 0x%04x", sis96x_smbus_base);
if ((retval = i2c_add_adapter(&sis96x_adapter))) { if ((retval = i2c_add_adapter(&sis96x_adapter))) {
......
...@@ -376,7 +376,7 @@ static int __devinit vt596_probe(struct pci_dev *pdev, ...@@ -376,7 +376,7 @@ static int __devinit vt596_probe(struct pci_dev *pdev,
dev_dbg(&pdev->dev, "VT596_smba = 0x%X\n", vt596_smba); dev_dbg(&pdev->dev, "VT596_smba = 0x%X\n", vt596_smba);
vt596_adapter.dev.parent = &pdev->dev; vt596_adapter.dev.parent = &pdev->dev;
snprintf(vt596_adapter.name, DEVICE_NAME_SIZE, snprintf(vt596_adapter.name, I2C_NAME_SIZE,
"SMBus Via Pro adapter at %04x", vt596_smba); "SMBus Via Pro adapter at %04x", vt596_smba);
return i2c_add_adapter(&vt596_adapter); return i2c_add_adapter(&vt596_adapter);
......
...@@ -320,7 +320,7 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -320,7 +320,7 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
} }
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, client_name, DEVICE_NAME_SIZE); strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
data->type = kind; data->type = kind;
new_client->id = adm1021_id++; new_client->id = adm1021_id++;
......
...@@ -692,7 +692,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -692,7 +692,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
} }
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, name, DEVICE_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
data->type = kind; data->type = kind;
......
...@@ -194,7 +194,7 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -194,7 +194,7 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
} }
/* Fill in the remaining client fields and put it into the global list */ /* Fill in the remaining client fields and put it into the global list */
strlcpy(new_client->name, name, DEVICE_NAME_SIZE); strlcpy(new_client->name, name, I2C_NAME_SIZE);
new_client->id = lm75_id++; new_client->id = lm75_id++;
data->valid = 0; data->valid = 0;
......
...@@ -638,7 +638,7 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -638,7 +638,7 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
} }
/* Fill in the remaining client fields and put into the global list */ /* Fill in the remaining client fields and put into the global list */
strlcpy(new_client->name, client_name, DEVICE_NAME_SIZE); strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
data->type = kind; data->type = kind;
data->valid = 0; data->valid = 0;
......
...@@ -853,19 +853,19 @@ int lm85_detect(struct i2c_adapter *adapter, int address, ...@@ -853,19 +853,19 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
/* Fill in the chip specific driver values */ /* Fill in the chip specific driver values */
if ( kind == any_chip ) { if ( kind == any_chip ) {
type_name = "lm85"; type_name = "lm85";
strlcpy(new_client->name, "Generic LM85", DEVICE_NAME_SIZE); strlcpy(new_client->name, "Generic LM85", I2C_NAME_SIZE);
} else if ( kind == lm85b ) { } else if ( kind == lm85b ) {
type_name = "lm85b"; type_name = "lm85b";
strlcpy(new_client->name, "National LM85-B", DEVICE_NAME_SIZE); strlcpy(new_client->name, "National LM85-B", I2C_NAME_SIZE);
} else if ( kind == lm85c ) { } else if ( kind == lm85c ) {
type_name = "lm85c"; type_name = "lm85c";
strlcpy(new_client->name, "National LM85-C", DEVICE_NAME_SIZE); strlcpy(new_client->name, "National LM85-C", I2C_NAME_SIZE);
} else if ( kind == adm1027 ) { } else if ( kind == adm1027 ) {
type_name = "adm1027"; type_name = "adm1027";
strlcpy(new_client->name, "Analog Devices ADM1027", DEVICE_NAME_SIZE); strlcpy(new_client->name, "Analog Devices ADM1027", I2C_NAME_SIZE);
} else if ( kind == adt7463 ) { } else if ( kind == adt7463 ) {
type_name = "adt7463"; type_name = "adt7463";
strlcpy(new_client->name, "Analog Devices ADT7463", DEVICE_NAME_SIZE); strlcpy(new_client->name, "Analog Devices ADT7463", I2C_NAME_SIZE);
} else { } else {
dev_dbg(&adapter->dev, "Internal error, invalid kind (%d)!", kind); dev_dbg(&adapter->dev, "Internal error, invalid kind (%d)!", kind);
err = -EFAULT ; err = -EFAULT ;
......
...@@ -727,7 +727,7 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -727,7 +727,7 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
new_client->dev.parent = &adapter->dev; new_client->dev.parent = &adapter->dev;
/* Fill in the remaining client fields and put into the global list */ /* Fill in the remaining client fields and put into the global list */
snprintf(new_client->name, DEVICE_NAME_SIZE, client_name); snprintf(new_client->name, I2C_NAME_SIZE, client_name);
data->valid = 0; data->valid = 0;
init_MUTEX(&data->update_lock); init_MUTEX(&data->update_lock);
......
...@@ -1117,7 +1117,7 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind, ...@@ -1117,7 +1117,7 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
data->lm75[i]->driver = &w83781d_driver; data->lm75[i]->driver = &w83781d_driver;
data->lm75[i]->flags = 0; data->lm75[i]->flags = 0;
strlcpy(data->lm75[i]->name, client_name, strlcpy(data->lm75[i]->name, client_name,
DEVICE_NAME_SIZE); I2C_NAME_SIZE);
if ((err = i2c_attach_client(data->lm75[i]))) { if ((err = i2c_attach_client(data->lm75[i]))) {
dev_err(&new_client->dev, "Subclient %d " dev_err(&new_client->dev, "Subclient %d "
"registration at address 0x%x " "registration at address 0x%x "
...@@ -1326,7 +1326,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1326,7 +1326,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
} }
/* Fill in the remaining client fields and put into the global list */ /* Fill in the remaining client fields and put into the global list */
strlcpy(new_client->name, client_name, DEVICE_NAME_SIZE); strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
data->type = kind; data->type = kind;
data->valid = 0; data->valid = 0;
......
...@@ -456,7 +456,7 @@ static int __init scx200_acb_create(int base, int index) ...@@ -456,7 +456,7 @@ static int __init scx200_acb_create(int base, int index)
memset(iface, 0, sizeof(*iface)); memset(iface, 0, sizeof(*iface));
adapter = &iface->adapter; adapter = &iface->adapter;
i2c_set_adapdata(adapter, iface); i2c_set_adapdata(adapter, iface);
snprintf(adapter->name, DEVICE_NAME_SIZE, "SCx200 ACB%d", index); snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
adapter->owner = THIS_MODULE; adapter->owner = THIS_MODULE;
adapter->id = I2C_ALGO_SMBUS; adapter->id = I2C_ALGO_SMBUS;
adapter->algo = &scx200_acb_algorithm; adapter->algo = &scx200_acb_algorithm;
......
...@@ -146,6 +146,8 @@ struct i2c_driver { ...@@ -146,6 +146,8 @@ struct i2c_driver {
extern struct bus_type i2c_bus_type; extern struct bus_type i2c_bus_type;
#define I2C_NAME_SIZE 50
/* /*
* i2c_client identifies a single device (i.e. chip) that is connected to an * i2c_client identifies a single device (i.e. chip) that is connected to an
* i2c bus. The behaviour is defined by the routines of the driver. This * i2c bus. The behaviour is defined by the routines of the driver. This
...@@ -166,7 +168,7 @@ struct i2c_client { ...@@ -166,7 +168,7 @@ struct i2c_client {
/* to the client */ /* to the client */
struct device dev; /* the device structure */ struct device dev; /* the device structure */
struct list_head list; struct list_head list;
char name[DEVICE_NAME_SIZE]; char name[I2C_NAME_SIZE];
struct completion released; struct completion released;
}; };
#define to_i2c_client(d) container_of(d, struct i2c_client, dev) #define to_i2c_client(d) container_of(d, struct i2c_client, dev)
...@@ -253,7 +255,7 @@ struct i2c_adapter { ...@@ -253,7 +255,7 @@ struct i2c_adapter {
int nr; int nr;
struct list_head clients; struct list_head clients;
struct list_head list; struct list_head list;
char name[DEVICE_NAME_SIZE]; char name[I2C_NAME_SIZE];
struct completion dev_released; struct completion dev_released;
struct completion class_dev_released; struct completion class_dev_released;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment