3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 074b11ffbf41..e7ab0035d305 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -649,7 +649,7 @@ static inline int __init unprotect_pm_master(void)
         return e;
 }
 
-static void __init clocks_init(void)
+static void __init clocks_init(struct device *dev)
 {
         int e = 0;
         struct clk *osc;
@@ -658,9 +658,9 @@ static void __init clocks_init(void)
 
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
         if (cpu_is_omap2430())
-                osc = clk_get(NULL, "osc_ck");
+                osc = clk_get(dev, "osc_ck");
         else
-                osc = clk_get(NULL, "osc_sys_ck");
+                osc = clk_get(dev, "osc_sys_ck");
 
         if (IS_ERR(osc)) {
                 printk(KERN_WARNING "Skipping twl4030 internal clock init and "
@@ -776,7 +776,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
         inuse = true;
 
         /* setup clock framework */
-        clocks_init();
+        clocks_init(&client->dev);
 
         /* Maybe init the T2 Interrupt subsystem */
         if (client->irq
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 1e93c837514f..4fa3bb2ddfe4 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -405,7 +405,6 @@ static void __init superio_serial_init(void)
         serial_port.type        = PORT_16550A;
         serial_port.uartclk     = 115200*16;
         serial_port.fifosize    = 16;
-        spin_lock_init(&serial_port.lock);
 
         /* serial port #1 */
         serial_port.iobase      = sio_dev.sp1_base;
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 1889a63ebc22..0d934bfbdd9b 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2839,6 +2839,8 @@ int __init early_serial_setup(struct uart_port *port)
         p->flags        = port->flags;
         p->mapbase      = port->mapbase;
         p->private_data = port->private_data;
+        p->type         = port->type;
+        p->line         = port->line;
 
         set_io_from_upio(p);
         if (port->serial_in)