diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-01 18:17:47 +0100 |
|---|---|---|
| committer | Joern Engel <joern@logfs.org> | 2013-03-06 12:53:00 -0800 |
| commit | 8928fcb449a6c8a6d9eb22f918295a84b4f7c797 (patch) | |
| tree | 076d0cfd56d3929d7d65a6452233a47b28985391 | |
| parent | d48705fddc24a995cc5be26c1ceee87c1f563f5b (diff) | |
| download | bcon2-8928fcb449a6c8a6d9eb22f918295a84b4f7c797.tar.gz | |
blockconsole: Rename device_lock with bc_device_lock
Avoid the name conflict with device_lock() defined in linux/device.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Joern Engel <joern@logfs.org>
| -rw-r--r-- | drivers/block/blockconsole.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/blockconsole.c b/drivers/block/blockconsole.c index c22272fb59bb72..40cc96e3e4c2fa 100644 --- a/drivers/block/blockconsole.c +++ b/drivers/block/blockconsole.c @@ -546,17 +546,17 @@ static void bcon_create_fuzzy(const char *name) } } -static DEFINE_SPINLOCK(device_lock); +static DEFINE_SPINLOCK(bcon_device_lock); static char scanned_devices[80]; static void bcon_do_add(struct work_struct *work) { char local_devices[80], *name, *remainder = local_devices; - spin_lock(&device_lock); + spin_lock(&bcon_device_lock); memcpy(local_devices, scanned_devices, sizeof(local_devices)); memset(scanned_devices, 0, sizeof(scanned_devices)); - spin_unlock(&device_lock); + spin_unlock(&bcon_device_lock); while (remainder && remainder[0]) { name = strsep(&remainder, ","); @@ -573,11 +573,11 @@ void bcon_add(const char *name) * to go pick it up asap. Once it is picked up, the buffer is empty * again, so hopefully it will suffice for all sane users. */ - spin_lock(&device_lock); + spin_lock(&bcon_device_lock); if (scanned_devices[0]) strncat(scanned_devices, ",", sizeof(scanned_devices)); strncat(scanned_devices, name, sizeof(scanned_devices)); - spin_unlock(&device_lock); + spin_unlock(&bcon_device_lock); schedule_work(&bcon_add_work); } |