Changeset 777 for GPL/trunk/alsa-kernel/drivers/mpu401

Timestamp:

Apr 21, 2025, 7:17:25 PM (7 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/drivers/mpu401/mpu401.c (modified) (6 diffs)
• alsa-kernel/drivers/mpu401/mpu401_uart.c (modified) (6 diffs)

GPL/trunk/alsa-kernel/drivers/mpu401/mpu401.c

@@ -69 +69 @@
 
         if (!uart_enter[dev])
-                snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");
+                dev_err(devptr, "the uart_enter option is obsolete; remove it\n");
 
         *rcard = NULL;
@@ -88 +88 @@
                                   irq[dev], NULL);
         if (err < 0) {
-                printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
+                dev_err(devptr, "MPU401 not detected at 0x%lx\n", port[dev]);
                 return err;
         }
@@ -103 +103 @@
 
         if (port[dev] == SNDRV_AUTO_PORT) {
-                snd_printk(KERN_ERR "specify port\n");
+                dev_err(&devptr->dev, "specify port\n");
                 return -EINVAL;
         }
         if (irq[dev] == SNDRV_AUTO_IRQ) {
-                snd_printk(KERN_ERR "specify or disable IRQ\n");
+                dev_err(&devptr->dev, "specify or disable IRQ\n");
                 return -EINVAL;
         }
@@ -146 +146 @@
         if (!pnp_port_valid(device, 0) ||
             pnp_port_flags(device, 0) & IORESOURCE_DISABLED) {
-                snd_printk(KERN_ERR "no PnP port\n");
+                dev_err(&device->dev, "no PnP port\n");
                 return -ENODEV;
         }
         if (pnp_port_len(device, 0) < IO_EXTENT) {
-                snd_printk(KERN_ERR "PnP port length is %llu, expected %d\n",
+                dev_err(&device->dev, "PnP port length is %llu, expected %d\n",
                            (unsigned long long)pnp_port_len(device, 0),
                            IO_EXTENT);
@@ -159 +159 @@
         if (!pnp_irq_valid(device, 0) ||
             pnp_irq_flags(device, 0) & IORESOURCE_DISABLED) {
-                snd_printk(KERN_WARNING "no PnP irq, using polling\n");
+                dev_warn(&device->dev, "no PnP irq, using polling\n");
                 irq[dev] = -1;
         } else {
@@ -247 +247 @@
         if (!snd_mpu401_devices) {
 #ifdef MODULE
-                printk(KERN_ERR "MPU-401 device not found or device busy\n");
+                pr_err("MPU-401 device not found or device busy\n");
 #endif
                 snd_mpu401_unregister_all();

GPL/trunk/alsa-kernel/drivers/mpu401/mpu401_uart.c

@@ -74 +74 @@
 #ifdef CONFIG_SND_DEBUG
         if (timeout <= 0)
-                snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n",
+                dev_err(mpu->rmidi->dev,
+                        "cmd: clear rx timeout (status = 0x%x)\n",
                            mpu->read(mpu, MPU401C(mpu)));
 #endif
@@ -236 +237 @@
 #ifdef CONFIG_SND_DEBUG
                 if (!timeout)
-                        snd_printk(KERN_ERR "cmd: tx timeout (status = 0x%x)\n",
+                        dev_err(mpu->rmidi->dev,
+                                "cmd: tx timeout (status = 0x%x)\n",
                                    mpu->read(mpu, MPU401C(mpu)));
 #endif
@@ -256 +258 @@
         spin_unlock_irqrestore(&mpu->input_lock, flags);
         if (!ok) {
-                snd_printk(KERN_ERR "cmd: 0x%x failed at 0x%lx "
-                           "(status = 0x%x, data = 0x%x)\n", cmd, mpu->port,
+                dev_err(mpu->rmidi->dev,
+                        "cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)\n",
+                        cmd, mpu->port,
                            mpu->read(mpu, MPU401C(mpu)),
                            mpu->read(mpu, MPU401D(mpu)));
@@ -558 +561 @@
         mpu->hardware = hardware;
         mpu->irq = -1;
+        mpu->rmidi = rmidi;
         if (! (info_flags & MPU401_INFO_INTEGRATED)) {
                 int res_size = hardware == MPU401_HW_PC98II ? 4 : 2;
                 mpu->res = request_region(port, res_size, "MPU401 UART");
                 if (!mpu->res) {
-                        snd_printk(KERN_ERR "mpu401_uart: "
-                                   "unable to grab port 0x%lx size %d\n",
+                        dev_err(rmidi->dev,
+                                "mpu401_uart: unable to grab port 0x%lx size %d\n",
                                    port, res_size);
                         err = -EBUSY;
@@ -584 +588 @@
                 if (request_irq(irq, snd_mpu401_uart_interrupt, 0,
                                 "MPU401 UART", (void *) mpu)) {
-                        snd_printk(KERN_ERR "mpu401_uart: "
-                                   "unable to grab IRQ %d\n", irq);
+                        dev_err(rmidi->dev,
+                                "mpu401_uart: unable to grab IRQ %d\n", irq);
                         err = -EBUSY;
                         goto free_device;
@@ -611 +615 @@
                         rmidi->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;
         }
-        mpu->rmidi = rmidi;
         if (rrawmidi)
                 *rrawmidi = rmidi;