Changeset 730

Timestamp:

Sep 10, 2022, 12:08:43 AM (3 years ago)

Author:

Paul Smedley

Message:

Cleanups

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/include/sound/config.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_bind.c (modified) (1 diff)
• include/linux/device.h (modified) (3 diffs)
• include/linux/pci.h (modified) (2 diffs)
• lib32/pci.c (modified) (2 diffs)

GPL/branches/uniaud32-next/alsa-kernel/include/sound/config.h

@@ -31 +31 @@
 #define CONFIG_SND_HDA_CODEC_CONEXANT
 #define CONFIG_SND_HDA_CODEC_CMEDIA
+#define CONFIG_SND_HDA_CODEC_HDMI
 #define CONFIG_SND_HDA_CODEC_REALTEK
 #define CONFIG_SND_HDA_CODEC_SIGMATEL

GPL/branches/uniaud32-next/alsa-kernel/pci/hda/hda_bind.c

@@ -245 +245 @@
 }
 
-#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
+#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) || defined(CONFIG_SND_HDA_CODEC_HDMI)
 /* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */
 static bool is_likely_hdmi_codec(struct hda_codec *codec)

GPL/branches/uniaud32-next/include/linux/device.h

@@ -69 +69 @@
   struct list_head      dma_pools;      /* dma pools (if dma'ble) */
   struct device_driver *driver;
+  void          *driver_data;   /* Driver data, set and get with
+                                           dev_set_drvdata/dev_get_drvdata */
   struct pm_dev *pm_dev;
   char  bus_id[20];
@@ -149 +151 @@
 extern struct device_driver *driver_find(const char *name,
                                          struct bus_type *bus);
-
-#define dev_set_drvdata(dev,ptr)        ((dev)->private_data = (ptr))
-#define dev_get_drvdata(dev)    (dev)->private_data
 
 #define MODULE_ALIAS_CHARDEV_MAJOR(x)
@@ -323 +322 @@
         return NUMA_NO_NODE;
 }
+
+static inline void *dev_get_drvdata(const struct device *dev)
+{
+        return dev->driver_data;
+}
+
+static inline void dev_set_drvdata(struct device *dev, void *data)
+{
+        dev->driver_data = data;
+}
+
 #endif /* _LINUX_DEVICE_H */
 

GPL/branches/uniaud32-next/include/linux/pci.h

@@ -672 +672 @@
 void pci_set_driver_data (struct pci_dev *dev, void *driver_data);
 
-#define pci_get_drvdata(a)   pci_get_driver_data(a)
-#define pci_set_drvdata(a,b) pci_set_driver_data(a, b)
-
 #define PCI_DEVICE(vend,dev) \
         .vendor = (vend), .device = (dev), \
@@ -739 +736 @@
 static inline bool pci_dev_run_wake(struct pci_dev *dev) { return 0; }
 
+/*
+ * Similar to the helpers above, these manipulate per-pci_dev
+ * driver-specific data.  They are really just a wrapper around
+ * the generic device structure functions of these calls.
+ */
+static inline void *pci_get_drvdata(struct pci_dev *pdev)
+{
+        return dev_get_drvdata(&pdev->dev);
+}
+
+static inline void pci_set_drvdata(struct pci_dev *pdev, void *data)
+{
+        dev_set_drvdata(&pdev->dev, data);
+}
 /* If you want to know what to call your pci_dev, ask this function.
  * Again, it's a wrapper around the generic device.

GPL/branches/uniaud32-next/lib32/pci.c

@@ -802 +802 @@
 }
 
-/**
- */
-void pci_set_driver_data (struct pci_dev *dev, void *driver_data)
-{
-  if (dev)
-    dev->driver_data = driver_data;
-}
-
-/**
- */
-void *pci_get_driver_data (struct pci_dev *dev)
-{
-  if (dev)
-    return dev->driver_data;
-  return 0;
-}
 
 /**
@@ -1040 +1024 @@
 }
 
-struct pci_driver_mapping {
-  struct pci_dev *dev;
-  struct pci_driver *drv;
-  unsigned long dma_mask;
-  void *driver_data;
-  u32 saved_config[16];
-};
-
-#define PCI_MAX_MAPPINGS 64
-static struct pci_driver_mapping drvmap [PCI_MAX_MAPPINGS] = { { NULL, } , };
-
-
-static struct pci_driver_mapping *get_pci_driver_mapping(struct pci_dev *dev)
-{
-  int i;
-
-  for (i = 0; i < PCI_MAX_MAPPINGS; i++)
-    if (drvmap[i].dev == dev)
-      return &drvmap[i];
-  return NULL;
-}
-
-struct pci_driver *snd_pci_compat_get_pci_driver(struct pci_dev *dev)
-{
-  struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
-  if (map)
-    return map->drv;
-  return NULL;
-}
-#if 0
-void * pci_get_drvdata (struct pci_dev *dev)
-{
-  struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
-  if (map)
-    return map->driver_data;
-  return NULL;
-}
-
-
-void pci_set_drvdata (struct pci_dev *dev, void *driver_data)
-{
-  struct pci_driver_mapping *map = get_pci_driver_mapping(dev);
-  if (map)
-    map->driver_data = driver_data;
-}
-#endif
-
-
 //******************************************************************************
 //******************************************************************************