Merge branch 'fix/hda' into for-linus

[mirror_ubuntu-bionic-kernel.git] / include / pcmcia / ss.h

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 7c23be706f128bbc02365e868687aa3dbcc73047..cbfba885eb85b8376dcc60bb0fb4608944b35015 100644 (file)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -154,7 +154,7 @@ struct pcmcia_socket {
        struct list_head                socket_list;
        struct completion               socket_released;
 
-       /* deprecated */
+       /* deprecated */
        unsigned int                    sock;           /* socket number */
 
 
@@ -164,7 +164,7 @@ struct pcmcia_socket {
        u_int                           map_size;
        u_int                           io_offset;
        u_int                           pci_irq;
-       struct pci_dev *                cb_dev;
+       struct pci_dev                  *cb_dev;
 
 
        /* socket setup is done so resources should be able to be allocated.
@@ -179,9 +179,9 @@ struct pcmcia_socket {
        u8                              reserved:5;
 
        /* socket operations */
-       struct pccard_operations *      ops;
-       struct pccard_resource_ops *    resource_ops;
-       void *                          resource_data;
+       struct pccard_operations        *ops;
+       struct pccard_resource_ops      *resource_ops;
+       void                            *resource_data;
 
        /* Zoom video behaviour is so chip specific its not worth adding
           this to _ops */
@@ -245,7 +245,7 @@ struct pcmcia_socket {
 
        /* cardbus (32-bit) */
 #ifdef CONFIG_CARDBUS
-       struct resource *               cb_cis_res;
+       struct resource                 *cb_cis_res;
        void __iomem                    *cb_cis_virt;
 #endif /* CONFIG_CARDBUS */