projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ssb
/
pcmcia.c
diff --git
a/drivers/ssb/pcmcia.c
b/drivers/ssb/pcmcia.c
index fbafed5b729bdcf6ae57889c3c9d4f05ca0509c5..b413e01870878b51097456ec71112bf32b56f2b5 100644
(file)
--- a/
drivers/ssb/pcmcia.c
+++ b/
drivers/ssb/pcmcia.c
@@
-143,7
+143,7
@@
int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus,
return 0;
error:
return 0;
error:
- ssb_
printk(KERN_ERR PFX
"Failed to switch to core %u\n", coreidx);
+ ssb_
err(
"Failed to switch to core %u\n", coreidx);
return err;
}
return err;
}
@@
-153,10
+153,9
@@
int ssb_pcmcia_switch_core(struct ssb_bus *bus,
int err;
#if SSB_VERBOSE_PCMCIACORESWITCH_DEBUG
int err;
#if SSB_VERBOSE_PCMCIACORESWITCH_DEBUG
- ssb_printk(KERN_INFO PFX
- "Switching to %s core, index %d\n",
- ssb_core_name(dev->id.coreid),
- dev->core_index);
+ ssb_info("Switching to %s core, index %d\n",
+ ssb_core_name(dev->id.coreid),
+ dev->core_index);
#endif
err = ssb_pcmcia_switch_coreidx(bus, dev->core_index);
#endif
err = ssb_pcmcia_switch_coreidx(bus, dev->core_index);
@@
-192,7
+191,7
@@
int ssb_pcmcia_switch_segment(struct ssb_bus *bus, u8 seg)
return 0;
error:
return 0;
error:
- ssb_
printk(KERN_ERR PFX
"Failed to switch pcmcia segment\n");
+ ssb_
err(
"Failed to switch pcmcia segment\n");
return err;
}
return err;
}
@@
-549,44
+548,39
@@
static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom)
bool failed = 0;
size_t size = SSB_PCMCIA_SPROM_SIZE;
bool failed = 0;
size_t size = SSB_PCMCIA_SPROM_SIZE;
- ssb_printk(KERN_NOTICE PFX
- "Writing SPROM. Do NOT turn off the power! "
- "Please stand by...\n");
+ ssb_notice("Writing SPROM. Do NOT turn off the power! Please stand by...\n");
err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEEN);
if (err) {
err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEEN);
if (err) {
- ssb_printk(KERN_NOTICE PFX
- "Could not enable SPROM write access.\n");
+ ssb_notice("Could not enable SPROM write access\n");
return -EBUSY;
}
return -EBUSY;
}
- ssb_
printk(KERN_NOTICE PFX
"[ 0%%");
+ ssb_
notice(
"[ 0%%");
msleep(500);
for (i = 0; i < size; i++) {
if (i == size / 4)
msleep(500);
for (i = 0; i < size; i++) {
if (i == size / 4)
- ssb_
printk
("25%%");
+ ssb_
cont
("25%%");
else if (i == size / 2)
else if (i == size / 2)
- ssb_
printk
("50%%");
+ ssb_
cont
("50%%");
else if (i == (size * 3) / 4)
else if (i == (size * 3) / 4)
- ssb_
printk
("75%%");
+ ssb_
cont
("75%%");
else if (i % 2)
else if (i % 2)
- ssb_
printk
(".");
+ ssb_
cont
(".");
err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
if (err) {
err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
if (err) {
- ssb_printk(KERN_NOTICE PFX
- "Failed to write to SPROM.\n");
+ ssb_notice("Failed to write to SPROM\n");
failed = 1;
break;
}
}
err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
if (err) {
failed = 1;
break;
}
}
err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
if (err) {
- ssb_printk(KERN_NOTICE PFX
- "Could not disable SPROM write access.\n");
+ ssb_notice("Could not disable SPROM write access\n");
failed = 1;
}
msleep(500);
if (!failed) {
failed = 1;
}
msleep(500);
if (!failed) {
- ssb_
printk
("100%% ]\n");
- ssb_
printk(KERN_NOTICE PFX "SPROM written.
\n");
+ ssb_
cont
("100%% ]\n");
+ ssb_
notice("SPROM written
\n");
}
return failed ? -EBUSY : 0;
}
return failed ? -EBUSY : 0;
@@
-700,7
+694,7
@@
static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
return -ENOSPC; /* continue with next entry */
error:
return -ENOSPC; /* continue with next entry */
error:
- ssb_
printk(KERN_ERR PFX
+ ssb_
err(
"PCMCIA: Failed to fetch device invariants: %s\n",
error_description);
return -ENODEV;
"PCMCIA: Failed to fetch device invariants: %s\n",
error_description);
return -ENODEV;
@@
-722,7
+716,7
@@
int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
ssb_pcmcia_get_mac, sprom);
if (res != 0) {
res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
ssb_pcmcia_get_mac, sprom);
if (res != 0) {
- ssb_
printk(KERN_ERR PFX
+ ssb_
err(
"PCMCIA: Failed to fetch MAC address\n");
return -ENODEV;
}
"PCMCIA: Failed to fetch MAC address\n");
return -ENODEV;
}
@@
-733,7
+727,7
@@
int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
if ((res == 0) || (res == -ENOSPC))
return 0;
if ((res == 0) || (res == -ENOSPC))
return 0;
- ssb_
printk(KERN_ERR PFX
+ ssb_
err(
"PCMCIA: Failed to fetch device invariants\n");
return -ENODEV;
}
"PCMCIA: Failed to fetch device invariants\n");
return -ENODEV;
}
@@
-843,6
+837,6
@@
int ssb_pcmcia_init(struct ssb_bus *bus)
return 0;
error:
return 0;
error:
- ssb_
printk(KERN_ERR PFX
"Failed to initialize PCMCIA host device\n");
+ ssb_
err(
"Failed to initialize PCMCIA host device\n");
return err;
}
return err;
}