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

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 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)

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();