Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5008ae2 authored by Priit Laes's avatar Priit Laes Committed by Greg Kroah-Hartman
Browse files

staging: csr: drv.c: Remove KERNEL_VERSION checks and associated defines 



Signed-off-by: default avatarPriit Laes <plaes@plaes.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e9950a6

drivers/staging/csr/drv.c

+8 −35
Original line number Diff line number Diff line
@@ -123,11 +123,7 @@ static void udi_set_log_filter(ul_client_t *pcli, 




/* Mutex to protect access to  priv->sme_cli */

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)

DEFINE_SEMAPHORE(udi_mutex);

#else

DECLARE_MUTEX(udi_mutex);

#endif



s32 CsrHipResultToStatus(CsrResult csrResult)

{
@@ -1979,18 +1975,6 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length) 
} /* uf_sme_queue_message() */

#endif





#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)

#define UF_DEVICE_CREATE(_class, _parent, _devno, _priv, _fmt, _args)       \

    device_create(_class, _parent, _devno, _priv, _fmt, _args)

#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)

#define UF_DEVICE_CREATE(_class, _parent, _devno, _priv, _fmt, _args)       \

    device_create_drvdata(_class, _parent, _devno, _priv, _fmt, _args)

#else

#define UF_DEVICE_CREATE(_class, _parent, _devno, _priv, _fmt, _args)       \

    device_create(_class, _parent, _devno, _fmt, _args)

#endif



/*

 ****************************************************************************

 *
@@ -2008,17 +1992,6 @@ static struct file_operations unifi_fops = { 
    .poll       = unifi_poll,

};



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)

#define UF_DEVICE_CREATE(_class, _parent, _devno, _priv, _fmt, _args)       \

    device_create(_class, _parent, _devno, _priv, _fmt, _args)

#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)

#define UF_DEVICE_CREATE(_class, _parent, _devno, _priv, _fmt, _args)       \

    device_create_drvdata(_class, _parent, _devno, _priv, _fmt, _args)

#else

#define UF_DEVICE_CREATE(_class, _parent, _devno, _priv, _fmt, _args)       \

    device_create(_class, _parent, _devno, _fmt, _args)

#endif



static dev_t unifi_first_devno;

static struct class *unifi_class;
@@ -2041,10 +2014,10 @@ int uf_create_device_nodes(unifi_priv_t *priv, int bus_id) 
    }



#ifdef SDIO_EXPORTS_STRUCT_DEVICE

    if (!UF_DEVICE_CREATE(unifi_class, priv->unifi_device,

    if (!device_create(unifi_class, priv->unifi_device,

                       devno, priv, "unifi%d", bus_id)) {

#else

    priv->unifi_device = UF_DEVICE_CREATE(unifi_class, NULL,

    priv->unifi_device = device_create(unifi_class, NULL,

                                       devno, priv, "unifi%d", bus_id);

    if (priv->unifi_device == NULL) {

#endif /* SDIO_EXPORTS_STRUCT_DEVICE */
@@ -2067,7 +2040,7 @@ int uf_create_device_nodes(unifi_priv_t *priv, int bus_id) 
        return r;

    }



    if (!UF_DEVICE_CREATE(unifi_class,

    if (!device_create(unifi_class,

#ifdef SDIO_EXPORTS_STRUCT_DEVICE

                       priv->unifi_device,

#else