Merge tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[mirror_ubuntu-hirsute-kernel.git] / drivers / firewire / ohci.c

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 54fdc39cd0bc3df8bd114986b4515adeac541dc1..7dde21b18b04c672516ceb14aaa1cc606ff17bcc 100644 (file)
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -1099,7 +1099,7 @@ static void context_tasklet(unsigned long data)
 static int context_add_buffer(struct context *ctx)
 {
        struct descriptor_buffer *desc;
-       dma_addr_t uninitialized_var(bus_addr);
+       dma_addr_t bus_addr;
        int offset;
 
        /*
@@ -1289,7 +1289,7 @@ static int at_context_queue_packet(struct context *ctx,
                                   struct fw_packet *packet)
 {
        struct fw_ohci *ohci = ctx->ohci;
-       dma_addr_t d_bus, uninitialized_var(payload_bus);
+       dma_addr_t d_bus, payload_bus;
        struct driver_data *driver_data;
        struct descriptor *d, *last;
        __le32 *header;
@@ -2445,7 +2445,7 @@ static int ohci_set_config_rom(struct fw_card *card,
 {
        struct fw_ohci *ohci;
        __be32 *next_config_rom;
-       dma_addr_t uninitialized_var(next_config_rom_bus);
+       dma_addr_t next_config_rom_bus;
 
        ohci = fw_ohci(card);
 
@@ -2933,10 +2933,10 @@ static struct fw_iso_context *ohci_allocate_iso_context(struct fw_card *card,
                                int type, int channel, size_t header_size)
 {
        struct fw_ohci *ohci = fw_ohci(card);
-       struct iso_context *uninitialized_var(ctx);
-       descriptor_callback_t uninitialized_var(callback);
-       u64 *uninitialized_var(channels);
-       u32 *uninitialized_var(mask), uninitialized_var(regs);
+       struct iso_context *ctx;
+       descriptor_callback_t callback;
+       u64 *channels;
+       u32 *mask, regs;
        int index, ret = -EBUSY;
 
        spin_lock_irq(&ohci->lock);