mISDN: Minor cleanups

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <kkeil@suse.de>

diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 8df12bf02af390665b8fdee60c56cd9bc9c9e543..2db06490b1ac179e7ce01cfd00981d6afea35c08 100644 (file)
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2333,10 +2333,10 @@ HFC_init(void)
                poll = HFCPCI_BTRANS_THRESHOLD;
 
        if (poll != HFCPCI_BTRANS_THRESHOLD) {
-               tics = poll * HZ / 8000;
+               tics = (poll * HZ) / 8000;
                if (tics < 1)
                        tics = 1;
-               poll = tics * 8000 / HZ;
+               poll = (tics * 8000) / HZ;
                if (poll > 256 || poll < 8) {
                        printk(KERN_ERR "%s: Wrong poll value %d not in range "
                                "of 8..256.\n", __func__, poll);

diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index c16cb7ac3d2a11d356d45b59cb3c76e200e3b0e4..7e60cb94b5c0826b2ceda0d7480bb35ee603eda9 100644 (file)
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -1141,7 +1141,7 @@ static int dsp_init(void)
        } else {
                poll = 8;
                while (poll <= MAX_POLL) {
-                       tics = poll * HZ / 8000;
+                       tics = (poll * HZ) / 8000;
                        if (tics * 8000 == poll * HZ) {
                                dsp_tics = tics;
                                dsp_poll = poll;

diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c
index 7a3a3e1e4d80603932f3910230cf545de215835d..bf999bdc41c3e87df4a670738b81b90b215c1c97 100644 (file)
--- a/drivers/isdn/mISDN/dsp_pipeline.c
+++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -92,7 +92,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
        if (!elem)
                return -EINVAL;
 
-       entry = kzalloc(sizeof(struct dsp_element_entry), GFP_KERNEL);
+       entry = kzalloc(sizeof(struct dsp_element_entry), GFP_ATOMIC);
        if (!entry)
                return -ENOMEM;
 
@@ -253,7 +253,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
        if (!len)
                return 0;
 
-       dup = kmalloc(len + 1, GFP_KERNEL);
+       dup = kmalloc(len + 1, GFP_ATOMIC);
        if (!dup)
                return 0;
        strcpy(dup, cfg);
@@ -270,7 +270,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
                                elem = entry->elem;
 
                                pipeline_entry = kmalloc(sizeof(struct
-                                       dsp_pipeline_entry), GFP_KERNEL);
+                                       dsp_pipeline_entry), GFP_ATOMIC);
                                if (!pipeline_entry) {
                                        printk(KERN_ERR "%s: failed to add "
                                            "entry to pipeline: %s (out of "