diff options
Diffstat (limited to 'net/dsa/dsa2.c')
-rw-r--r-- | net/dsa/dsa2.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 8c4eccb0cfe6..f8445fa73448 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c | |||
@@ -834,20 +834,6 @@ struct dsa_switch *dsa_switch_alloc(struct device *dev, size_t n) | |||
834 | if (!ds) | 834 | if (!ds) |
835 | return NULL; | 835 | return NULL; |
836 | 836 | ||
837 | /* We avoid allocating memory outside dsa_switch | ||
838 | * if it is not needed. | ||
839 | */ | ||
840 | if (n <= sizeof(ds->_bitmap) * 8) { | ||
841 | ds->bitmap = &ds->_bitmap; | ||
842 | } else { | ||
843 | ds->bitmap = devm_kcalloc(dev, | ||
844 | BITS_TO_LONGS(n), | ||
845 | sizeof(unsigned long), | ||
846 | GFP_KERNEL); | ||
847 | if (unlikely(!ds->bitmap)) | ||
848 | return NULL; | ||
849 | } | ||
850 | |||
851 | ds->dev = dev; | 837 | ds->dev = dev; |
852 | ds->num_ports = n; | 838 | ds->num_ports = n; |
853 | 839 | ||