Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits) Documentation/kernel-docs.txt update. arch/cris: typo in KERN_INFO Storage class should be before const qualifier kernel/printk.c: comment fix update I/O sched Kconfig help texts - CFQ is now default, not AS. Remove duplicate listing of Cris arch from README kbuild: more doc. cleanups doc: make doc. for maxcpus= more visible drivers/net/eexpress.c: remove duplicate comment add a help text for BLK_DEV_GENERIC correct a dead URL in the IP_MULTICAST help text fix the BAYCOM_SER_HDX help text fix SCSI_SCAN_ASYNC help text trivial documentation patch for platform.txt Fix typos concerning hierarchy Fix comment typo "spin_lock_irqrestore". Fix misspellings of "agressive". drivers/scsi/a100u2w.c: trivial typo patch Correct trivial typo in log2.h. Remove useless FIND_FIRST_BIT() macro from cardbus.c. ...
This commit is contained in:
@@ -494,7 +494,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
ali1535_adapter.dev.parent = &dev->dev;
|
||||
|
||||
snprintf(ali1535_adapter.name, I2C_NAME_SIZE,
|
||||
|
@@ -489,7 +489,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
ali15x3_adapter.dev.parent = &dev->dev;
|
||||
|
||||
snprintf(ali15x3_adapter.name, I2C_NAME_SIZE,
|
||||
|
@@ -374,7 +374,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
|
||||
dev_dbg(&pdev->dev, "SMBREV = 0x%X\n", temp);
|
||||
dev_dbg(&pdev->dev, "AMD756_smba = 0x%X\n", amd756_ioport);
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
amd756_smbus.dev.parent = &pdev->dev;
|
||||
|
||||
sprintf(amd756_smbus.name, "SMBus %s adapter at %04x",
|
||||
|
@@ -371,7 +371,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev,
|
||||
smbus->adapter.algo = &smbus_algorithm;
|
||||
smbus->adapter.algo_data = smbus;
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
smbus->adapter.dev.parent = &dev->dev;
|
||||
|
||||
pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0);
|
||||
|
@@ -522,7 +522,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
|
||||
else
|
||||
dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n");
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
i801_adapter.dev.parent = &dev->dev;
|
||||
|
||||
snprintf(i801_adapter.name, I2C_NAME_SIZE,
|
||||
|
@@ -425,7 +425,7 @@ static int __devinit piix4_probe(struct pci_dev *dev,
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
piix4_adapter.dev.parent = &dev->dev;
|
||||
|
||||
snprintf(piix4_adapter.name, I2C_NAME_SIZE,
|
||||
|
@@ -384,7 +384,7 @@ static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
sis5595_adapter.dev.parent = &dev->dev;
|
||||
|
||||
sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",
|
||||
|
@@ -477,7 +477,7 @@ static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_i
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
sis630_adapter.dev.parent = &dev->dev;
|
||||
|
||||
sprintf(sis630_adapter.name, "SMBus SIS630 adapter at %04x",
|
||||
|
@@ -297,7 +297,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
sis96x_adapter.dev.parent = &dev->dev;
|
||||
|
||||
snprintf(sis96x_adapter.name, I2C_NAME_SIZE,
|
||||
|
@@ -138,7 +138,7 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i
|
||||
outb(inb(I2C_DIR) & ~(I2C_SDA | I2C_SCL), I2C_DIR);
|
||||
outb(inb(I2C_OUT) & ~(I2C_SDA | I2C_SCL), I2C_OUT);
|
||||
|
||||
/* set up the driverfs linkage to our parent device */
|
||||
/* set up the sysfs linkage to our parent device */
|
||||
vt586b_adapter.dev.parent = &dev->dev;
|
||||
|
||||
res = i2c_bit_add_bus(&vt586b_adapter);
|
||||
|
Reference in New Issue
Block a user