iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] i2c: Big i2c-elektor cleanup

Browse Source 
Cleanups to the i2c-elektor driver:

* Set the i2c_adapter name field to "i2c-elektor" and use this string
  in all resource requests and printks.
* Change space-padding for tab indentation, kill trailing white space,
  remove space before comma.
* Use dev_info, pr_info and pr_debug instead of printk.
* Lines chopped to 80 columns.

Signed-off-by: Stig Telfer <stig@lizardlogic.co.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Stig Telfer 2005-10-08 00:23:27 +02:00 committed by Greg Kroah-Hartman
parent 3634ff6a32
commit fe3d6a9978
1 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/i2c/busses/i2c-elektor.c
View File

@ -62,6 +62,8 @@ static wait_queue_head_t pcf_wait;
static int pcf_pending; static int pcf_pending;
static spinlock_t lock; static spinlock_t lock;
static struct i2c_adapter pcf_isa_ops;
/* ----- local functions ---------------------------------------------- */ /* ----- local functions ---------------------------------------------- */
static void pcf_isa_setbyte(void *data, int ctl, int val) static void pcf_isa_setbyte(void *data, int ctl, int val)
@ -73,7 +75,7 @@ static void pcf_isa_setbyte(void *data, int ctl, int val)
val |= I2C_PCF_ENI; val |= I2C_PCF_ENI;
} }
pr_debug("i2c-elektor: Write %p 0x%02X\n", address, val); pr_debug("%s: Write %p 0x%02X\n", pcf_isa_ops.name, address, val);
iowrite8(val, address); iowrite8(val, address);
#ifdef __alpha__ #ifdef __alpha__
/* API UP2000 needs some hardware fudging to make the write stick */ /* API UP2000 needs some hardware fudging to make the write stick */
@ -86,7 +88,7 @@ static int pcf_isa_getbyte(void *data, int ctl)
u8 __iomem *address = ctl ? (base_iomem + 1) : base_iomem; u8 __iomem *address = ctl ? (base_iomem + 1) : base_iomem;
int val = ioread8(address); int val = ioread8(address);
pr_debug("i2c-elektor: Read %p 0x%02X\n", address, val); pr_debug("%s: Read %p 0x%02X\n", pcf_isa_ops.name, address, val);
return (val); return (val);
} }
@ -142,39 +144,40 @@ static int pcf_isa_init(void)
{ {
spin_lock_init(&lock); spin_lock_init(&lock);
if (!mmapped) { if (!mmapped) {
if (!request_region(base, 2, "i2c (isa bus adapter)")) { if (!request_region(base, 2, pcf_isa_ops.name)) {
printk(KERN_ERR printk(KERN_ERR "%s: requested I/O region (%#x:2) is "
"i2c-elektor: requested I/O region (0x%X:2) " "in use\n", pcf_isa_ops.name, base);
"is in use.\n", base);
return -ENODEV; return -ENODEV;
} }
base_iomem = ioport_map(base, 2); base_iomem = ioport_map(base, 2);
if (!base_iomem) { if (!base_iomem) {
printk(KERN_ERR "i2c-elektor: remap of I/O region " printk(KERN_ERR "%s: remap of I/O region %#x failed\n",
"%#x failed\n", base); pcf_isa_ops.name, base);
release_region(base, 2); release_region(base, 2);
return -ENODEV; return -ENODEV;
} }
} else { } else {
if (!request_mem_region(base, 2, "i2c-elektor")) { if (!request_mem_region(base, 2, pcf_isa_ops.name)) {
printk(KERN_ERR "i2c-elektor: requested memory region " printk(KERN_ERR "%s: requested memory region (%#x:2) "
"(%#x:2) is in use\n", base); "is in use\n", pcf_isa_ops.name, base);
return -ENODEV; return -ENODEV;
} }
base_iomem = ioremap(base, 2); base_iomem = ioremap(base, 2);
if (base_iomem == NULL) { if (base_iomem == NULL) {
printk(KERN_ERR "i2c-elektor: remap of memory region " printk(KERN_ERR "%s: remap of memory region %#x "
"%#x failed\n", base); "failed\n", pcf_isa_ops.name, base);
release_mem_region(base, 2); release_mem_region(base, 2);
return -ENODEV; return -ENODEV;
} }
} }
pr_debug("i2c-elektor: registers %#x remapped to %p\n", base, pr_debug("%s: registers %#x remapped to %p\n", pcf_isa_ops.name, base,
base_iomem); base_iomem);
if (irq > 0) { if (irq > 0) {
if (request_irq(irq, pcf_isa_handler, 0, "PCF8584", NULL) < 0) { if (request_irq(irq, pcf_isa_handler, 0, pcf_isa_ops.name,
printk(KERN_ERR "i2c-elektor: Request irq%d failed\n", irq); NULL) < 0) {
printk(KERN_ERR "%s: Request irq%d failed\n",
pcf_isa_ops.name, irq);
irq = 0; irq = 0;
} else } else
enable_irq(irq); enable_irq(irq);
@ -202,7 +205,7 @@ static struct i2c_adapter pcf_isa_ops = {
.class = I2C_CLASS_HWMON, .class = I2C_CLASS_HWMON,
.id = I2C_HW_P_ELEK, .id = I2C_HW_P_ELEK,
.algo_data = &pcf_isa_data, .algo_data = &pcf_isa_data,
.name = "PCF8584 ISA adapter", .name = "i2c-elektor",
}; };
static int __init i2c_pcfisa_init(void) static int __init i2c_pcfisa_init(void)
@ -220,7 +223,9 @@ static int __init i2c_pcfisa_init(void)
/* yeap, we've found cypress, let's check config */ /* yeap, we've found cypress, let's check config */
if (!pci_read_config_byte(cy693_dev, 0x47, &config)) { if (!pci_read_config_byte(cy693_dev, 0x47, &config)) {
pr_debug("i2c-elektor: found cy82c693, config register 0x47 = 0x%02x.\n", config); pr_debug("%s: found cy82c693, config "
"register 0x47 = 0x%02x\n",
pcf_isa_ops.name, config);
/* UP2000 board has this register set to 0xe1, /* UP2000 board has this register set to 0xe1,
but the most significant bit as seems can be but the most significant bit as seems can be
@ -240,7 +245,9 @@ static int __init i2c_pcfisa_init(void)
8.25 MHz (PCI/4) clock 8.25 MHz (PCI/4) clock
(this can be read from cypress) */ (this can be read from cypress) */
clock = I2C_PCF_CLK | I2C_PCF_TRNS90; clock = I2C_PCF_CLK | I2C_PCF_TRNS90;
printk(KERN_INFO "i2c-elektor: found API UP2000 like board, will probe PCF8584 later.\n"); pr_info("%s: found API UP2000 like "
"board, will probe PCF8584 "
"later\n", pcf_isa_ops.name);
} }
} }
pci_dev_put(cy693_dev); pci_dev_put(cy693_dev);
@ -250,12 +257,11 @@ static int __init i2c_pcfisa_init(void)
/* sanity checks for mmapped I/O */ /* sanity checks for mmapped I/O */
if (mmapped && base < 0xc8000) { if (mmapped && base < 0xc8000) {
printk(KERN_ERR "i2c-elektor: incorrect base address (0x%0X) specified for mmapped I/O.\n", base); printk(KERN_ERR "%s: incorrect base address (%#x) specified "
"for mmapped I/O\n", pcf_isa_ops.name, base);
return -ENODEV; return -ENODEV;
} }
printk(KERN_INFO "i2c-elektor: i2c pcf8584-isa adapter driver\n");
if (base == 0) { if (base == 0) {
base = DEFAULT_BASE; base = DEFAULT_BASE;
} }
@ -266,7 +272,7 @@ static int __init i2c_pcfisa_init(void)
if (i2c_pcf_add_bus(&pcf_isa_ops) < 0) if (i2c_pcf_add_bus(&pcf_isa_ops) < 0)
goto fail; goto fail;
printk(KERN_ERR "i2c-elektor: found device at %#x.\n", base); dev_info(&pcf_isa_ops.dev, "found device at %#x\n", base);
return 0; return 0;